use wx-style header and commets; fix indentation to be 4 spaces; move Doxygen comment...

[wxWidgets.git] / src / mac / carbon / brush.cpp

diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp
index 5de190f1a58deda7c282ff99c8de755e145e3151..46132211bec5cb8650b2e4473ba36c0361600ebe 100644 (file)
--- a/src/mac/carbon/brush.cpp
+++ b/src/mac/carbon/brush.cpp
@@ -42,7 +42,7 @@ public:
 protected:
     void DoSetStipple(const wxBitmap& stipple);
 
-    wxBitmap      m_stipple ;
+    wxBitmap      m_stipple;
     wxColour      m_colour;
     wxBrushStyle  m_style;
 };
@@ -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;
 }
 //
 //
@@ -100,6 +100,13 @@ wxBrush::wxBrush(const wxColour& col, wxBrushStyle style)
     m_refData = new wxBrushRefData( col, style );
 }
 
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxBrush::wxBrush(const wxColour& col, int style)
+{
+    m_refData = new wxBrushRefData(col, (wxBrushStyle)style);
+}
+#endif
+
 wxBrush::wxBrush(const wxBitmap& stipple)
 {
     m_refData = new wxBrushRefData( stipple );
@@ -140,7 +147,7 @@ const wxColour& wxBrush::GetColour() const
 
 wxBrushStyle wxBrush::GetStyle() const
 {
-    wxCHECK_MSG( Ok(), 0, _T("invalid brush") );
+    wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, _T("invalid brush") );
 
     return M_BRUSHDATA->GetStyle();
 }