undef LoadMenu() (patch #521743)

[wxWidgets.git] / include / wx / mac / brush.h

diff --git a/include/wx/mac/brush.h b/include/wx/mac/brush.h
index 9be385ab7ab7808c5dabe83e596f581e090f88db..0fbf59175300e11bde00bc54879aba0a1312b22e 100644 (file)
--- a/include/wx/mac/brush.h
+++ b/include/wx/mac/brush.h
@@ -22,25 +22,12 @@
 
 class WXDLLEXPORT wxBrush;
 
-class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
+typedef enum 
 {
-    friend class WXDLLEXPORT wxBrush;
-public:
-    wxBrushRefData();
-    wxBrushRefData(const wxBrushRefData& data);
-    ~wxBrushRefData();
-
-protected:
-    int           m_style;
-    wxBitmap      m_stipple ;
-    wxColour      m_colour;
-    bool          m_isMacTheme ;
-    ThemeBrush    m_macThemeBrush ;
-    bool          m_isMacThemeBackground ;
-    ThemeBackgroundKind m_macThemeBackground ;
-};
-
-#define M_BRUSHDATA ((wxBrushRefData *)m_refData)
+  kwxMacBrushColour ,
+  kwxMacBrushTheme ,
+  kwxMacBrushThemeBackground
+} wxMacBrushKind ;
 
 // Brush
 class WXDLLEXPORT wxBrush: public wxGDIObject
@@ -49,7 +36,7 @@ class WXDLLEXPORT wxBrush: public wxGDIObject
 
 public:
   wxBrush();
-  wxBrush(ThemeBrush macThemeBrush ) ;
+  wxBrush(short macThemeBrush ) ;
   wxBrush(const wxColour& col, int style);
   wxBrush(const wxBitmap& stipple);
   inline wxBrush(const wxBrush& brush) { Ref(brush); }
@@ -59,20 +46,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 SetMacTheme(ThemeBrush macThemeBrush) ;
-  virtual void SetMacThemeBackground(ThemeBackgroundKind macThemeBackground ) ;
+  virtual void SetMacTheme(short macThemeBrush) ;
+  virtual void SetMacThemeBackground(unsigned long macThemeBackground ,  WXRECTPTR extent) ;
 
   inline wxBrush& operator = (const wxBrush& brush) { if (*this == brush) return (*this); Ref(brush); return *this; }
   inline bool operator == (const wxBrush& brush) { return m_refData == brush.m_refData; }
   inline bool operator != (const wxBrush& brush) { return m_refData != brush.m_refData; }
 
-  inline bool IsMacTheme()  const { return (M_BRUSHDATA ? M_BRUSHDATA->m_isMacTheme : false); };
-  inline bool IsMacThemeBackground()  const { return (M_BRUSHDATA ? M_BRUSHDATA->m_isMacThemeBackground : false); };
-  inline ThemeBackgroundKind GetMacThemeBackground()  const { return (M_BRUSHDATA ? ( M_BRUSHDATA->m_isMacThemeBackground ? M_BRUSHDATA->m_macThemeBackground : 0) : 0); };
-  inline ThemeBrush GetMacTheme()  const { return (M_BRUSHDATA ? ( M_BRUSHDATA->m_isMacTheme ? M_BRUSHDATA->m_macThemeBrush : kThemeBrushBlack) : kThemeBrushBlack); };
-  inline wxColour& GetColour() const { return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour); };
-  inline int GetStyle() const { return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); };
-  inline wxBitmap *GetStipple() const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0); };
+  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) ; }