compatibility fix: have wxListKey ctors from C strings so that passing string literal...

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

diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h
index 31d4b7292c8d75274242fd7ce89f30d1e570169f..51e1c7854854a3771190d9dbea04a386dd5b0329 100644 (file)
--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        brush.h
+// Name:        wx/gtk1/brush.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -11,10 +11,6 @@
 #ifndef __GTKBRUSHH__
 #define __GTKBRUSHH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
@@ -25,26 +21,28 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxBrush;
+class WXDLLIMPEXP_CORE wxBrush;
 
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 
-class wxBrush: public wxGDIObject
+class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
 {
 public:
-    wxBrush();
-    wxBrush( const wxColour &colour, int style );
+    wxBrush() { }
+
+    wxBrush( const wxColour &colour, int style = wxSOLID );
     wxBrush( const wxBitmap &stippleBitmap );
-    wxBrush( const wxBrush &brush );
-    ~wxBrush();
-    wxBrush& operator = ( const wxBrush& brush );
+    virtual ~wxBrush();
+
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }
+
     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;
+    virtual int GetStyle() const;
     wxColour &GetColour() const;
     wxBitmap *GetStipple() const;
 
@@ -53,9 +51,11 @@ public:
     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;
+
     DECLARE_DYNAMIC_CLASS(wxBrush)
 };