X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83dcd7814285b86182c71cbb1f6aef7303862546..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/mac/carbon/brush.h

diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h
index 90ac01b9fe..ea482f5089 100644
--- a/include/wx/mac/carbon/brush.h
+++ b/include/wx/mac/carbon/brush.h
@@ -16,21 +16,12 @@
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 
-class WXDLLEXPORT wxBrush;
-
-typedef enum
-{
-    kwxMacBrushColour ,
-    kwxMacBrushTheme ,
-    kwxMacBrushThemeBackground
-} wxMacBrushKind ;
+class WXDLLIMPEXP_FWD_CORE wxBrush;
 
 // Brush
 class WXDLLEXPORT wxBrush: public wxBrushBase
 {
-    DECLARE_DYNAMIC_CLASS(wxBrush)
-
-public:
+ public:
     wxBrush();
     wxBrush(short macThemeBrush ) ;
     wxBrush(const wxColour& col, int style = wxSOLID);
@@ -41,31 +32,23 @@ public:
     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) ;
 
     bool operator == (const wxBrush& brush) const;
     bool operator != (const wxBrush& brush) const
         { return !(*this == brush); }
 
-    wxMacBrushKind MacGetBrushKind()  const ;
-
-    unsigned long MacGetThemeBackground(WXRECTPTR extent)  const ;
-    short MacGetTheme()  const ;
-    wxColour& GetColour() const ;
+    const wxColour& GetColour() const ;
     virtual int GetStyle() const ;
     wxBitmap *GetStipple() const ;
 
     virtual bool Ok() const { return IsOk(); }
     virtual bool IsOk() const { return (m_refData != NULL) ; }
 
-// Implementation
-
-    // Useful helper: create the brush resource
-    bool RealizeResource();
-
+protected:
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 private:
-    void Unshare();
+    DECLARE_DYNAMIC_CLASS(wxBrush)    
 };
 
 #endif