X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c89f5c02b1ecc6098b21b39b01509dd387c1cb34..23ee4b4874aa32111eca609bfe4c9e62e6ca5a6a:/include/wx/gtk/brush.h

diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h
index 2859c6ad39..144bb4a1cb 100644
--- a/include/wx/gtk/brush.h
+++ b/include/wx/gtk/brush.h
@@ -11,7 +11,7 @@
 #ifndef __GTKBRUSHH__
 #define __GTKBRUSHH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
@@ -31,24 +31,26 @@ class wxBrush;
 // wxBrush
 //-----------------------------------------------------------------------------
 
-class wxBrush: public wxGDIObject
+class wxBrush: public wxBrushBase
 {
 public:
     wxBrush() { }
-    
-    wxBrush( const wxColour &colour, int style );
+
+    wxBrush( const wxColour &colour, int style = wxSOLID );
     wxBrush( const wxBitmap &stippleBitmap );
     ~wxBrush();
-    
-    wxBrush( const wxBrush &brush ) { Ref(brush); }
+
+    wxBrush( const wxBrush &brush )
+        : wxBrushBase()
+        { Ref(brush); }
     wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; }
-    
+
     bool Ok() const { return m_refData != NULL; }
-    
+
     bool operator == ( const wxBrush& brush ) const;
     bool operator != (const wxBrush& brush) const { return !(*this == brush); }
 
-    int GetStyle() const;
+    virtual int GetStyle() const;
     wxColour &GetColour() const;
     wxBitmap *GetStipple() const;
 
@@ -61,7 +63,7 @@ private:
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
-    
+
     DECLARE_DYNAMIC_CLASS(wxBrush)
 };