Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use non-deprecated pen and brush style constants in wxOSX code.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2014-05-17 12:29:41 +00:00
parent a0aaf8e51b
commit da4ca22383
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/generic/combog.cpp
View File

@@ -252,7 +252,7 @@ void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
#ifdef __WXMAC__ #ifdef __WXMAC__
wxPen pen1( wxColour(133,133,133), wxPen pen1( wxColour(133,133,133),
customBorder, customBorder,
wxSOLID ); wxPENSTYLE_SOLID );
#else #else
wxPen pen1( wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT), wxPen pen1( wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT),
customBorder, customBorder,

2
src/osx/carbon/dcclient.cpp
View File

@@ -81,7 +81,7 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window )
} }
DoSetClippingRegion( 0 , 0 , m_width , m_height ) ; DoSetClippingRegion( 0 , 0 , m_width , m_height ) ;
SetBackground(wxBrush(window->GetBackgroundColour(),wxSOLID)); SetBackground(wxBrush(window->GetBackgroundColour(),wxBRUSHSTYLE_SOLID));
SetFont( window->GetFont() ) ; SetFont( window->GetFont() ) ;
} }

6
src/osx/carbon/graphics.cpp
View File

@@ -599,7 +599,7 @@ wxMacCoreGraphicsColour::wxMacCoreGraphicsColour()
wxMacCoreGraphicsColour::wxMacCoreGraphicsColour( const wxBrush &brush ) wxMacCoreGraphicsColour::wxMacCoreGraphicsColour( const wxBrush &brush )
{ {
Init(); Init();
if ( brush.GetStyle() == wxSOLID ) if ( brush.GetStyle() == wxBRUSHSTYLE_SOLID )
{ {
m_color.reset( wxMacCreateCGColor( brush.GetColour() )); m_color.reset( wxMacCreateCGColor( brush.GetColour() ));
} }
@@ -2796,7 +2796,7 @@ wxGraphicsMatrix wxMacCoreGraphicsRenderer::CreateMatrix( wxDouble a, wxDouble b
wxGraphicsPen wxMacCoreGraphicsRenderer::CreatePen(const wxPen& pen) wxGraphicsPen wxMacCoreGraphicsRenderer::CreatePen(const wxPen& pen)
{ {
if ( !pen.IsOk() || pen.GetStyle() == wxTRANSPARENT ) if ( !pen.IsOk() || pen.GetStyle() == wxPENSTYLE_TRANSPARENT )
return wxNullGraphicsPen; return wxNullGraphicsPen;
else else
{ {
@@ -2808,7 +2808,7 @@ wxGraphicsPen wxMacCoreGraphicsRenderer::CreatePen(const wxPen& pen)
wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateBrush(const wxBrush& brush ) wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateBrush(const wxBrush& brush )
{ {
if ( !brush.IsOk() || brush.GetStyle() == wxTRANSPARENT ) if ( !brush.IsOk() || brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT )
return wxNullGraphicsBrush; return wxNullGraphicsBrush;
else else
{ {

12
src/osx/carbon/statbrma.cpp
View File

@@ -132,18 +132,18 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event))
if ( MacIsReallyHilited() ) if ( MacIsReallyHilited() )
{ {
wxPen white( *wxWHITE , 1 , wxSOLID ); wxPen white( *wxWHITE , 1 , wxPENSTYLE_SOLID );
if (major >= 10) if (major >= 10)
{ {
// Finder statusbar border color: (Project Builder similar is 9B9B9B) // Finder statusbar border color: (Project Builder similar is 9B9B9B)
if ( MacGetTopLevelWindow()->GetExtraStyle() & wxFRAME_EX_METAL ) 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 else
dc.SetPen(wxPen(wxColour(0xB1, 0xB1, 0xB1), 1, wxSOLID)); dc.SetPen(wxPen(wxColour(0xB1, 0xB1, 0xB1), 1, wxPENSTYLE_SOLID));
} }
else else
{ {
wxPen black( *wxBLACK , 1 , wxSOLID ); wxPen black( *wxBLACK , 1 , wxPENSTYLE_SOLID );
dc.SetPen(black); dc.SetPen(black);
} }
@@ -155,9 +155,9 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event))
{ {
if (major >= 10) if (major >= 10)
// Finder statusbar border color: (Project Builder similar is 9B9B9B) // 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 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); dc.DrawLine(0, 0, w, 0);
} }