Lots of updates for color dialog and sliders

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

diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h
index 43213033b030969a4d7a983da3533291ac11c4f9..dd20823aed936ba8a62b650a45391252c4f2593f 100644 (file)
--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -33,33 +33,38 @@ class wxBrush;
 
 class wxBrush: public wxGDIObject
 {
-  DECLARE_DYNAMIC_CLASS(wxBrush)
-
-  public:
-
-    wxBrush();
+public:
+    wxBrush() { }
+    
     wxBrush( const wxColour &colour, int style );
     wxBrush( const wxBitmap &stippleBitmap );
-    wxBrush( const wxBrush &brush );
     ~wxBrush();
-    wxBrush& operator = ( const wxBrush& brush );
-    bool operator == ( const wxBrush& brush );
-    bool operator != ( const wxBrush& brush );
-    bool Ok() const;
+    
+    wxBrush( const wxBrush &brush )
+        : wxGDIObject()
+        { 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;
     wxColour &GetColour() const;
     wxBitmap *GetStipple() const;
 
-
     void SetColour( const wxColour& col );
     void SetColour( unsigned char r, unsigned char g, unsigned char b );
     void SetStyle( int style );
     void SetStipple( const wxBitmap& stipple );
 
-    void Unshare();
-
-    // no data :-)
+private:
+    // ref counting code
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    
+    DECLARE_DYNAMIC_CLASS(wxBrush)
 };
 
 #endif // __GTKBRUSHH__