no real change; just add the standard separator where it's missing

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

diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h
index 3cac78adc727c8bc99ecb43bae0a60319d766f41..7a44ae2a335dff62b200b501056a396fb67d6e1f 100644 (file)
--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -1,21 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        brush.h
+// Name:        wx/gtk1/brush.h

 // Purpose:
 // Author:      Robert Roebling
 // 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__
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKBRUSHH__
 #define __GTKBRUSHH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"


@@ -26,35 +21,46 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBrush;

 
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 

-class wxBrush: public wxGDIObject
+class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase

 {
 {

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

 
 

-    wxBrush(void);
-    wxBrush( const wxColour &colour, const int style );
-    wxBrush( const wxString &colourName, const int style );
+    wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID );
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+#endif

     wxBrush( const wxBitmap &stippleBitmap );
     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;
-    
-    // no data :-)
+    virtual ~wxBrush();
+
+    bool operator==(const wxBrush& brush) const;
+    bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
+
+    wxBrushStyle 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( wxBrushStyle style );
+    void SetStipple( const wxBitmap& stipple );
+
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxBrushStyle)style); }
+#endif
+
+private:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+    DECLARE_DYNAMIC_CLASS(wxBrush)

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