From 82c5e9ab462170405c8f08df7c5a38585abf78bd Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Fri, 21 Mar 2008 09:37:59 +0000 Subject: [PATCH] fix wxBrush for the mac build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/carbon/brush.h | 3 +++ src/mac/carbon/brush.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h index d1a2f41d94..f553b4ec05 100644 --- 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); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) ); +#endif wxBrush(const wxBitmap& stipple); virtual ~wxBrush(); diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp index 37f2043f65..46132211be 100644 --- 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; - m_style = stipple.GetMask() ? wxSTIPPLE_MASK_OPAQUE : wxSTIPPLE; + m_style = stipple.GetMask() ? wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE : wxBRUSHSTYLE_STIPPLE; } // // -- 2.45.2