Solved problem with wxhInstance name being mangled by MSVC; wxGetInstance is now...

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

diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h
index 32048f67b74d50d67ec6b181f9fa74490c4ff6b6..c52eb450111e90d5ce0ee078994abfb95f7ca247 100644 (file)
--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -2,10 +2,9 @@
 // Name:        brush.h
 // Purpose:
 // Author:      Robert Roebling
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -38,22 +37,27 @@ class wxBrush: public wxGDIObject
 
   public:
 
 
   public:
 

-    wxBrush(void);
+    wxBrush();

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

-    wxBrush( const wxString &colourName, int style );

     wxBrush( const wxBitmap &stippleBitmap );
     wxBrush( const wxBrush &brush );
     wxBrush( const wxBitmap &stippleBitmap );
     wxBrush( const wxBrush &brush );

-    wxBrush( const wxBrush *brush );
-    ~wxBrush(void);
+    ~wxBrush();

     wxBrush& operator = ( const wxBrush& brush );
     bool operator == ( const wxBrush& brush );
     bool operator != ( const wxBrush& brush );
     wxBrush& operator = ( const wxBrush& brush );
     bool operator == ( const wxBrush& brush );
     bool operator != ( const wxBrush& brush );

-    bool Ok(void) const;
+    bool Ok() const;
+
+    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();

 
 

-    int GetStyle(void) const;
-    wxColour &GetColour(void) const;
-    wxBitmap *GetStipple(void) const;
-    

     // no data :-)
 };
 
     // no data :-)
 };