wxTheColourDatabase->Find() can fail.

[wxWidgets.git] / include / wx / mac / carbon / brush.h

diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h
index c99c10daf0ec7763bbc8f9b3539b2f5a90aea926..31b9593ab0eb0829e33e253f4fbd57d9c084e102 100644 (file)
--- a/include/wx/mac/carbon/brush.h
+++ b/include/wx/mac/carbon/brush.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        brush.h
+// Name:        wx/mac/carbon/brush.h

 // Purpose:     wxBrush class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxBrush class
 // Author:      Stefan Csomor
 // Modified by:


@@ -35,23 +35,18 @@ public:
     wxBrush(short macThemeBrush ) ;
     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);
     wxBrush(short macThemeBrush ) ;
     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);

-    wxBrush(const wxBrush& brush)
-        : wxBrushBase()
-        { Ref(brush); }

     ~wxBrush();
 
     ~wxBrush();
 

-    virtual void SetColour(const wxColour& col)  ;
-    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
+    virtual void SetColour(const wxColour& col) ;
+    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;

     virtual void SetStyle(int style)  ;
     virtual void SetStipple(const wxBitmap& stipple)  ;
     virtual void MacSetTheme(short macThemeBrush) ;
     virtual void MacSetThemeBackground(unsigned long macThemeBackground ,  WXRECTPTR extent) ;
 
     virtual void SetStyle(int style)  ;
     virtual void SetStipple(const wxBitmap& stipple)  ;
     virtual void MacSetTheme(short macThemeBrush) ;
     virtual void MacSetThemeBackground(unsigned long macThemeBackground ,  WXRECTPTR extent) ;
 

-    wxBrush& operator = (const wxBrush& brush)
-    { if (*this == brush) return (*this); Ref(brush); return *this; }
-    bool operator == (const wxBrush& brush)
+    bool operator == (const wxBrush& brush) const

     { return m_refData == brush.m_refData; }
     { return m_refData == brush.m_refData; }

-    bool operator != (const wxBrush& brush)
+    bool operator != (const wxBrush& brush) const

     { return m_refData != brush.m_refData; }
 
     wxMacBrushKind MacGetBrushKind()  const ;
     { return m_refData != brush.m_refData; }
 
     wxMacBrushKind MacGetBrushKind()  const ;