X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d7ee9e860187240a5f82ec4489c831f894065f2..70405f7e3d3a1274d54c05ca8124d8bfb0bc3bb1:/include/wx/mgl/brush.h

diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h
index 325828bf16..ec06a3821e 100644
--- a/include/wx/mgl/brush.h
+++ b/include/wx/mgl/brush.h
@@ -1,20 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        brush.h
+// Name:        wx/mgl/brush.h
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __WX_BRUSH_H__
 #define __WX_BRUSH_H__
 
-#ifdef __GNUG__
-#pragma interface "brush.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
@@ -25,44 +20,48 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBrush;
 
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBrush: public wxGDIObject
+class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase
 {
 public:
     wxBrush() {}
-    wxBrush(const wxColour &colour, 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 wxBrush &brush);
-    ~wxBrush() {}
-    wxBrush& operator = (const wxBrush& brush);
-    bool operator == (const wxBrush& brush) const;
-    bool operator != (const wxBrush& brush) const;
-    bool Ok() const;
 
-    int GetStyle() const;
-    wxColour &GetColour() const;
+    bool operator==(const wxBrush& brush) const;
+    bool operator!=(const wxBrush& brush) const;
+
+    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(int style);
+    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
+
     // implementation:
 
     void* GetMaskPattern() const;
     void* GetPixPattern() const;
 
 protected:
-    // ref counting code
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxBrush)