Bitmap button updates

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

diff --git a/include/wx/mac/brush.h b/include/wx/mac/brush.h
index 0fbf59175300e11bde00bc54879aba0a1312b22e..b03a6b332ed9e2bb24fa077b94b19d9b38f5a5de 100644 (file)
--- a/include/wx/mac/brush.h
+++ b/include/wx/mac/brush.h
@@ -12,7 +12,7 @@
 #ifndef _WX_BRUSH_H_
 #define _WX_BRUSH_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "brush.h"
 #endif
 
@@ -39,7 +39,9 @@ public:
   wxBrush(short macThemeBrush ) ;
   wxBrush(const wxColour& col, int style);
   wxBrush(const wxBitmap& stipple);
-  inline wxBrush(const wxBrush& brush) { Ref(brush); }
+  wxBrush(const wxBrush& brush)
+      : wxGDIObject()
+      { Ref(brush); }
   ~wxBrush();
 
   virtual void SetColour(const wxColour& col)  ;
@@ -49,9 +51,12 @@ public:
   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; }
+  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 ;