use AllocExclusive

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

diff --git a/include/wx/mac/classic/brush.h b/include/wx/mac/classic/brush.h
index 16b517550fae93075bfd6195030c165bde897f98..492953dce9270f63437e308b956f3888d2801153 100644 (file)
--- a/include/wx/mac/classic/brush.h
+++ b/include/wx/mac/classic/brush.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -35,10 +35,7 @@ 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();
+    virtual ~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)  ;


@@ -47,11 +44,9 @@ public:
     virtual void SetMacTheme(short macThemeBrush) ;
     virtual void SetMacThemeBackground(unsigned long macThemeBackground ,  WXRECTPTR extent) ;
 
     virtual void SetMacTheme(short macThemeBrush) ;
     virtual void SetMacThemeBackground(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 ;


@@ -62,7 +57,8 @@ public:
     virtual int GetStyle() const ;
     wxBitmap *GetStipple() const ;
 
     virtual int GetStyle() const ;
     wxBitmap *GetStipple() const ;
 

-    virtual bool Ok() const { return (m_refData != NULL) ; }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (m_refData != NULL) ; }

 
 // Implementation
 
 
 // Implementation