X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb9d5bd07e7aa0b190c3ee60f5778a974ac9f87b..8cd6a9ad50c00a94e62558a3b55e814028d81100:/include/wx/mgl/brush.h

diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h
index 7f7ab1a239..318018f8cb 100644
--- a/include/wx/mgl/brush.h
+++ b/include/wx/mgl/brush.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        brush.h
+// Name:        wx/mgl/brush.h
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __WX_BRUSH_H__
 #define __WX_BRUSH_H__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "brush.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
@@ -25,33 +20,30 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBrush;
 
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBrush: public wxBrushBase
+class WXDLLEXPORT wxBrush : public wxBrushBase
 {
 public:
     wxBrush() {}
-    wxBrush(const wxColour &colour, int style = wxSOLID);
+    wxBrush(const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
     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;
 
-    virtual int GetStyle() const;
+    bool operator==(const wxBrush& brush) const;
+    bool operator!=(const wxBrush& brush) const;
+
+    virtual 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);
 
     // implementation:
@@ -60,9 +52,8 @@ public:
     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)