fixed memory leak in wxXmlResource introduced when fixing wxVector<> usage (patch...

[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 349bde4603c2f445cd1b32df94e5d8f2fc8a27b0..e66a86f8d6216d1b74b7c6aa888ca74c6e77ab98 100644 (file)
--- a/include/wx/mac/carbon/brush.h
+++ b/include/wx/mac/carbon/brush.h
@@ -16,23 +16,13 @@
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 
 #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
 {
 
 // Brush
 class WXDLLEXPORT wxBrush: public wxBrushBase
 {

-    DECLARE_DYNAMIC_CLASS(wxBrush)
-

 public:
     wxBrush();
 public:
     wxBrush();

-    wxBrush(short macThemeBrush ) ;

     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);
     virtual ~wxBrush();
     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);
     virtual ~wxBrush();


@@ -41,34 +31,20 @@ 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 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
-    { return m_refData == brush.m_refData; }
-    bool operator != (const wxBrush& brush) const
-    { return m_refData != brush.m_refData; }
+    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 int GetStyle() const ;
     wxBitmap *GetStipple() const ;
 

-    virtual bool Ok() const { return IsOk(); }
-    virtual bool IsOk() const { return (m_refData != NULL) ; }
-
-// Implementation
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

 
 

-    // Useful helper: create the brush resource
-    bool RealizeResource();
-
-    // When setting properties, we must make sure we're not changing
-    // another object
-    void Unshare();
+private:
+    DECLARE_DYNAMIC_CLASS(wxBrush)

 };
 
 };
 

-#endif
-    // _WX_BRUSH_H_
+#endif // _WX_BRUSH_H_