From da4ca22383ddd352ca34a5f5fd51567b9324ab65 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 17 May 2014 12:29:41 +0000
Subject: [PATCH] Use non-deprecated pen and brush style constants in wxOSX
 code.

Use wx{PEN,BRUSH}STYLE_{SOLID,TRANSPARENT} instead of the old
wx{SOLID,TRANSPARENT}.

Closes #16269.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/combog.cpp      |  2 +-
 src/osx/carbon/dcclient.cpp |  2 +-
 src/osx/carbon/graphics.cpp |  6 +++---
 src/osx/carbon/statbrma.cpp | 12 ++++++------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/generic/combog.cpp b/src/generic/combog.cpp
index 76b15fc072..e4453c4cbe 100644
--- a/src/generic/combog.cpp
+++ b/src/generic/combog.cpp
@@ -252,7 +252,7 @@ void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 #ifdef __WXMAC__
         wxPen pen1( wxColour(133,133,133),
                     customBorder,
-                    wxSOLID );
+                    wxPENSTYLE_SOLID );
 #else
         wxPen pen1( wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT),
                     customBorder,
diff --git a/src/osx/carbon/dcclient.cpp b/src/osx/carbon/dcclient.cpp
index e619f25404..2d3df17821 100644
--- a/src/osx/carbon/dcclient.cpp
+++ b/src/osx/carbon/dcclient.cpp
@@ -81,7 +81,7 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window )
     }
     DoSetClippingRegion( 0 , 0 , m_width , m_height ) ;
 
-    SetBackground(wxBrush(window->GetBackgroundColour(),wxSOLID));
+    SetBackground(wxBrush(window->GetBackgroundColour(),wxBRUSHSTYLE_SOLID));
 
     SetFont( window->GetFont() ) ;
 }
diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index fabb331e74..43f2391073 100644
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -599,7 +599,7 @@ wxMacCoreGraphicsColour::wxMacCoreGraphicsColour()
 wxMacCoreGraphicsColour::wxMacCoreGraphicsColour( const wxBrush &brush )
 {
     Init();
-    if ( brush.GetStyle() == wxSOLID )
+    if ( brush.GetStyle() == wxBRUSHSTYLE_SOLID )
     {
         m_color.reset( wxMacCreateCGColor( brush.GetColour() ));
     }
@@ -2796,7 +2796,7 @@ wxGraphicsMatrix wxMacCoreGraphicsRenderer::CreateMatrix( wxDouble a, wxDouble b
 
 wxGraphicsPen wxMacCoreGraphicsRenderer::CreatePen(const wxPen& pen)
 {
-    if ( !pen.IsOk() || pen.GetStyle() == wxTRANSPARENT )
+    if ( !pen.IsOk() || pen.GetStyle() == wxPENSTYLE_TRANSPARENT )
         return wxNullGraphicsPen;
     else
     {
@@ -2808,7 +2808,7 @@ wxGraphicsPen wxMacCoreGraphicsRenderer::CreatePen(const wxPen& pen)
 
 wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateBrush(const wxBrush& brush )
 {
-    if ( !brush.IsOk() || brush.GetStyle() == wxTRANSPARENT )
+    if ( !brush.IsOk() || brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT )
         return wxNullGraphicsBrush;
     else
     {
diff --git a/src/osx/carbon/statbrma.cpp b/src/osx/carbon/statbrma.cpp
index cc7e463ba1..2c5152f34c 100644
--- a/src/osx/carbon/statbrma.cpp
+++ b/src/osx/carbon/statbrma.cpp
@@ -132,18 +132,18 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event))
 
     if ( MacIsReallyHilited() )
     {
-        wxPen white( *wxWHITE , 1 , wxSOLID );
+        wxPen white( *wxWHITE , 1 , wxPENSTYLE_SOLID );
         if (major >= 10)
         {
             // Finder statusbar border color: (Project Builder similar is 9B9B9B)
             if ( MacGetTopLevelWindow()->GetExtraStyle() & wxFRAME_EX_METAL )
-                dc.SetPen(wxPen(wxColour(0x40, 0x40, 0x40), 1, wxSOLID));
+                dc.SetPen(wxPen(wxColour(0x40, 0x40, 0x40), 1, wxPENSTYLE_SOLID));
             else
-                dc.SetPen(wxPen(wxColour(0xB1, 0xB1, 0xB1), 1, wxSOLID));
+                dc.SetPen(wxPen(wxColour(0xB1, 0xB1, 0xB1), 1, wxPENSTYLE_SOLID));
         }
         else
         {
-            wxPen black( *wxBLACK , 1 , wxSOLID );
+            wxPen black( *wxBLACK , 1 , wxPENSTYLE_SOLID );
             dc.SetPen(black);
         }
 
@@ -155,9 +155,9 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event))
     {
         if (major >= 10)
             // Finder statusbar border color: (Project Builder similar is 9B9B9B)
-            dc.SetPen(wxPen(wxColour(0xB1, 0xB1, 0xB1), 1, wxSOLID));
+            dc.SetPen(wxPen(wxColour(0xB1, 0xB1, 0xB1), 1, wxPENSTYLE_SOLID));
         else
-            dc.SetPen(wxPen(wxColour(0x80, 0x80, 0x80), 1, wxSOLID));
+            dc.SetPen(wxPen(wxColour(0x80, 0x80, 0x80), 1, wxPENSTYLE_SOLID));
 
         dc.DrawLine(0, 0, w, 0);
     }