Wine fixes

[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 7ffb716cb01fb1c85d2af3f3c29efed26fa9a476..49528efbea0951cf85ddd69dbc72e86073af709f 100644 (file)
--- a/include/wx/mac/carbon/brush.h
+++ b/include/wx/mac/carbon/brush.h
@@ -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,12 +44,9 @@ public:
     virtual void MacSetTheme(short macThemeBrush) ;
     virtual void MacSetThemeBackground(unsigned long macThemeBackground ,  WXRECTPTR extent) ;
 
     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) const
-    { return m_refData == brush.m_refData; }
+    bool operator == (const wxBrush& brush) const;

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

-    { return m_refData != brush.m_refData; }
+        { return !(*this == brush); }

 
     wxMacBrushKind MacGetBrushKind()  const ;
 
 
     wxMacBrushKind MacGetBrushKind()  const ;
 


@@ -62,7 +56,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