we need our own imaglist implementation because in wxmac wxIcon does not inherit...

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

diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h
index c52eb450111e90d5ce0ee078994abfb95f7ca247..144bb4a1cb47e61e3c133267316c87eee4d14146 100644 (file)
--- a/include/wx/gtk/brush.h
+++ b/include/wx/gtk/brush.h
@@ -11,7 +11,7 @@
 #ifndef __GTKBRUSHH__
 #define __GTKBRUSHH__
 
 #ifndef __GTKBRUSHH__
 #define __GTKBRUSHH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -31,23 +31,26 @@ class wxBrush;
 // wxBrush
 //-----------------------------------------------------------------------------
 
 // wxBrush
 //-----------------------------------------------------------------------------
 

-class wxBrush: public wxGDIObject
+class wxBrush: public wxBrushBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxBrush)
+public:
+    wxBrush() { }

 
 

-  public:
-
-    wxBrush();
-    wxBrush( const wxColour &colour, int style );
+    wxBrush( const wxColour &colour, int style = wxSOLID );

     wxBrush( const wxBitmap &stippleBitmap );
     wxBrush( const wxBitmap &stippleBitmap );

-    wxBrush( const wxBrush &brush );

     ~wxBrush();
     ~wxBrush();

-    wxBrush& operator = ( const wxBrush& brush );
-    bool operator == ( const wxBrush& brush );
-    bool operator != ( const wxBrush& brush );
-    bool Ok() const;

 
 

-    int GetStyle() const;
+    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); }
+
+    virtual int GetStyle() const;

     wxColour &GetColour() const;
     wxBitmap *GetStipple() const;
 
     wxColour &GetColour() const;
     wxBitmap *GetStipple() const;
 


@@ -56,9 +59,12 @@ class wxBrush: public wxGDIObject
     void SetStyle( int style );
     void SetStipple( const wxBitmap& stipple );
 
     void SetStyle( int style );
     void SetStipple( const wxBitmap& stipple );
 

-    void Unshare();
+private:
+    // ref counting code
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;

 
 

-    // no data :-)
+    DECLARE_DYNAMIC_CLASS(wxBrush)

 };
 
 #endif // __GTKBRUSHH__
 };
 
 #endif // __GTKBRUSHH__