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

fix wxBrush for the mac build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-03-21 09:37:59 +00:00
parent 8064223b7b
commit 82c5e9ab46
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/mac/carbon/brush.h
View File

@@ -24,6 +24,9 @@ class WXDLLEXPORT wxBrush: public wxBrushBase
public: public:
wxBrush(); wxBrush();
wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID); wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
#if FUTURE_WXWIN_COMPATIBILITY_3_0
wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
#endif
wxBrush(const wxBitmap& stipple); wxBrush(const wxBitmap& stipple);
virtual ~wxBrush(); virtual ~wxBrush();

2
src/mac/carbon/brush.cpp
View File

@@ -81,7 +81,7 @@ bool wxBrushRefData::operator==(const wxBrushRefData& data) const
void wxBrushRefData::DoSetStipple(const wxBitmap& stipple) void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)
{ {
m_stipple = stipple; m_stipple = stipple;
m_style = stipple.GetMask() ? wxSTIPPLE_MASK_OPAQUE : wxSTIPPLE; m_style = stipple.GetMask() ? wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE : wxBRUSHSTYLE_STIPPLE;
} }
// //
// //