X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cf73271dd6f442a98e86b559d4a55c37e25b99f..9611686694f0449c7f7ced2e0badad9f04a22ea5:/include/wx/mac/carbon/brush.h?ds=sidebyside

diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h
index 12e60e06d1..49528efbea 100644
--- 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:
@@ -12,70 +12,61 @@
 #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"
 
 class WXDLLEXPORT wxBrush;
 
-typedef enum 
+typedef enum
 {
-  kwxMacBrushColour ,
-  kwxMacBrushTheme ,
-  kwxMacBrushThemeBackground
+    kwxMacBrushColour ,
+    kwxMacBrushTheme ,
+    kwxMacBrushThemeBackground
 } wxMacBrushKind ;
 
 // Brush
-class WXDLLEXPORT wxBrush: public wxGDIObject
+class WXDLLEXPORT wxBrush: public wxBrushBase
 {
-  DECLARE_DYNAMIC_CLASS(wxBrush)
+    DECLARE_DYNAMIC_CLASS(wxBrush)
 
 public:
-  wxBrush();
-  wxBrush(short macThemeBrush ) ;
-  wxBrush(const wxColour& col, int style = wxSOLID);
-  wxBrush(const wxBitmap& stipple);
-  wxBrush(const wxBrush& brush)
-      : wxGDIObject()
-      { Ref(brush); }
-  ~wxBrush();
-
-  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 SetMacTheme(short macThemeBrush) ;
-  virtual void SetMacThemeBackground(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 ;
-
-  unsigned long GetMacThemeBackground(WXRECTPTR extent)  const ;
-  short GetMacTheme()  const ;
-  wxColour& GetColour() const ;
-  int GetStyle() const ;
-  wxBitmap *GetStipple() const ;
-
-  virtual bool Ok() const { return (m_refData != NULL) ; }
+    wxBrush();
+    wxBrush(short macThemeBrush ) ;
+    wxBrush(const wxColour& col, int style = wxSOLID);
+    wxBrush(const wxBitmap& stipple);
+    virtual ~wxBrush();
+
+    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 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 ;
+    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();
+    // Useful helper: create the brush resource
+    bool RealizeResource();
 
-  // When setting properties, we must make sure we're not changing
-  // another object
-  void Unshare();
+    // When setting properties, we must make sure we're not changing
+    // another object
+    void Unshare();
 };
 
 #endif