Applied patch [ 670782 ] Combobox uses popup window width

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

diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h
index bd3eeeba5fbfb1bdff70f0cbf7914c5c1b25f4d8..eabb80bde9bc83cfa1146a2e083145c046ff8861 100644 (file)
--- a/include/wx/gtk/brush.h
+++ b/include/wx/gtk/brush.h
@@ -4,14 +4,14 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKBRUSHH__
 #define __GTKBRUSHH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKBRUSHH__
 #define __GTKBRUSHH__
 

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

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -33,34 +33,38 @@ class wxBrush;
 
 class wxBrush: public wxGDIObject
 {
 
 class wxBrush: public wxGDIObject
 {

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

     wxBrush( const wxColour &colour, int style );
     wxBrush( const wxBitmap &stippleBitmap );
     wxBrush( const wxColour &colour, int style );
     wxBrush( const wxBitmap &stippleBitmap );

-    wxBrush( const wxBrush &brush );
-    wxBrush( const wxBrush *brush );
-    ~wxBrush(void);
-    wxBrush& operator = ( const wxBrush& brush );
-    bool operator == ( const wxBrush& brush );
-    bool operator != ( const wxBrush& brush );
-    bool Ok(void) const;
-
-    int GetStyle(void) const;
-    wxColour &GetColour(void) const;
-    wxBitmap *GetStipple(void) const;
+    ~wxBrush();

     
     

+    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 SetColour( const wxColour& col );
     void SetColour( unsigned char r, unsigned char g, unsigned char b );
     void SetStyle( int style );
     void SetStipple( const wxBitmap& stipple );

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

     
     

-    void Unshare(void);
-  
-    // no data :-)
+    DECLARE_DYNAMIC_CLASS(wxBrush)

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