wxMac should use /src/mac/carbon/spinctrl.cpp, applied some sizing

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

diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h
index 31d4b7292c8d75274242fd7ce89f30d1e570169f..de6bf6f62a4abac0c47547540f31521476e51548 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
 


@@ -34,15 +34,21 @@ class wxBrush;
 class wxBrush: public wxGDIObject
 {
 public:
 class wxBrush: public wxGDIObject
 {
 public:

-    wxBrush();
-    wxBrush( const wxColour &colour, int style );
+    wxBrush() { }
+    
+    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 );
+    
+    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;

-    bool operator != ( const wxBrush& brush ) const;
-    bool Ok() const;
+    bool operator != (const wxBrush& brush) const { return !(*this == brush); }

 
     int GetStyle() const;
     wxColour &GetColour() const;
 
     int GetStyle() const;
     wxColour &GetColour() const;


@@ -53,9 +59,11 @@ public:
     void SetStyle( int style );
     void SetStipple( const wxBitmap& stipple );
 
     void SetStyle( int style );
     void SetStipple( const wxBitmap& stipple );
 

-    void Unshare();
-

 private:
 private:

+    // ref counting code
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    

     DECLARE_DYNAMIC_CLASS(wxBrush)
 };
 
     DECLARE_DYNAMIC_CLASS(wxBrush)
 };