wxTheApp can't be assigned to, anyhow, so make ms_appInstance private and provide...

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

diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h
index 32048f67b74d50d67ec6b181f9fa74490c4ff6b6..e1856216972b0d53394b690e78bcac13621db472 100644 (file)
--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -2,17 +2,16 @@
 // Name:        brush.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKBRUSHH__
 #define __GTKBRUSHH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
@@ -34,27 +33,38 @@ class wxBrush;
 
 class wxBrush: public wxGDIObject
 {
-  DECLARE_DYNAMIC_CLASS(wxBrush)
+public:
+    wxBrush() { }
+    
+    wxBrush( const wxColour &colour, int style = wxSOLID );
+    wxBrush( const wxBitmap &stippleBitmap );
+    ~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); }
 
-  public:
+    int GetStyle() const;
+    wxColour &GetColour() const;
+    wxBitmap *GetStipple() const;
 
-    wxBrush(void);
-    wxBrush( const wxColour &colour, int style );
-    wxBrush( const wxString &colourName, 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;
+    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;
     
-    // no data :-)
+    DECLARE_DYNAMIC_CLASS(wxBrush)
 };
 
 #endif // __GTKBRUSHH__