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

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

@@ -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
{