for Gray Controls implementation

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

diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h
index 94c65f760f13033663065605e9e8095dd17db3ff..d42e564a814960b851841964d08fd200930b13c2 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

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


@@ -34,36 +33,30 @@ 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 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;

 
 

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

     void SetColour( const wxColour& col );
     void SetColour( const wxColour& col );

-    void SetColour( const wxString& col );

     void SetColour( unsigned char r, unsigned char g, unsigned char b );
     void SetStyle( int style );
     void SetStipple( const wxBitmap& stipple );
     void SetColour( unsigned char r, unsigned char g, unsigned char b );
     void SetStyle( int style );
     void SetStipple( const wxBitmap& stipple );

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

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