check that the version of __sync_sub_and_fetch that returns a value is supported...

[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 d5c3e5be123db2b1867f72b04b09787b9e6629f4..ea482f508900d2fef9d97abd8e1d7af167dec845 100644 (file)
--- 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:
 // Purpose:     wxBrush class
 // Author:      Stefan Csomor
 // Modified by:


@@ -12,70 +12,43 @@
 #ifndef _WX_BRUSH_H_
 #define _WX_BRUSH_H_
 
 #ifndef _WX_BRUSH_H_
 #define _WX_BRUSH_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "brush.h"
-#endif
-

 #include "wx/gdicmn.h"
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 
 #include "wx/gdicmn.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:
+ public:

     wxBrush();
     wxBrush(short macThemeBrush ) ;
     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);
     wxBrush();
     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 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; }

 
 

-    wxMacBrushKind MacGetBrushKind()  const ;
+    bool operator == (const wxBrush& brush) const;
+    bool operator != (const wxBrush& brush) const
+        { return !(*this == brush); }

 
 

-    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 (m_refData != NULL) ; }
-
-// Implementation
-
-    // Useful helper: create the brush resource
-    bool RealizeResource();
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (m_refData != NULL) ; }

 
 

-    // When setting properties, we must make sure we're not changing
-    // another object
-    void Unshare();
+protected:
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+private:
+    DECLARE_DYNAMIC_CLASS(wxBrush)    

 };
 
 #endif
 };
 
 #endif