fix wxBrush for the mac build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h
index d1a2f41d94dbbc51a1a9180d176ad990a2c1dbd9..f553b4ec056e3a248d7ded0bcf6699e4abb6a022 100644 (file)
--- a/include/wx/mac/carbon/brush.h
+++ b/include/wx/mac/carbon/brush.h
@@ -24,6 +24,9 @@ class WXDLLEXPORT wxBrush: public wxBrushBase
 public:
     wxBrush();
     wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
 public:
     wxBrush();
     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);
     virtual ~wxBrush();
 
     wxBrush(const wxBitmap& stipple);
     virtual ~wxBrush();
 

diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp
index 37f2043f65628dedeb346b4f91cd2b2122cc9844..46132211bec5cb8650b2e4473ba36c0361600ebe 100644 (file)
--- a/src/mac/carbon/brush.cpp
+++ b/src/mac/carbon/brush.cpp
@@ -81,7 +81,7 @@ bool wxBrushRefData::operator==(const wxBrushRefData& data) const
 void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)
 {
     m_stipple = stipple;
 void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)
 {
     m_stipple = stipple;

-    m_style = stipple.GetMask() ? wxSTIPPLE_MASK_OPAQUE : wxSTIPPLE;
+    m_style = stipple.GetMask() ? wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE : wxBRUSHSTYLE_STIPPLE;

 }
 //
 //
 }
 //
 //