Added wxDataViewCustomRenderer::RenderText() for renderer simple text in platform...

[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 31b9593ab0eb0829e33e253f4fbd57d9c084e102..ae73a725dd6444725f89201602cbe63989da422b 100644 (file)
--- a/include/wx/mac/carbon/brush.h
+++ b/include/wx/mac/carbon/brush.h
@@ -16,7 +16,7 @@
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 

-class WXDLLEXPORT wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBrush;

 
 typedef enum
 {
 
 typedef enum
 {


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


@@ -44,10 +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) ;
 

-    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 ;
 


@@ -57,15 +56,15 @@ 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
 
     // Useful helper: create the brush resource
     bool RealizeResource();
 
 
 // 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();
 };
 
     void Unshare();
 };