X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..fba05595e6cca40763f8ead119c7ad61cb01e0e4:/include/wx/mac/carbon/brush.h?ds=inline

diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h
index c99c10daf0..ae73a725dd 100644
--- 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:
@@ -16,7 +16,7 @@
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 
-class WXDLLEXPORT wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBrush;
 
 typedef enum
 {
@@ -35,24 +35,18 @@ public:
     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) ;
     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)
-    { return m_refData == brush.m_refData; }
-    bool operator != (const wxBrush& brush)
-    { return m_refData != brush.m_refData; }
+    bool operator == (const wxBrush& brush) const;
+    bool operator != (const wxBrush& brush) const
+        { return !(*this == brush); }
 
     wxMacBrushKind MacGetBrushKind()  const ;
 
@@ -62,15 +56,15 @@ public:
     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
 
     // Useful helper: create the brush resource
     bool RealizeResource();
 
-    // When setting properties, we must make sure we're not changing
-    // another object
+private:
     void Unshare();
 };