use wxTextEntry in wxTextValidator (modified patch 1821743)

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

diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h
index c419a9f5ae98add77f04ed8d244f6ffdeea5db1d..97fccfdd1a2006e5986d5757b4abd8154f47e3db 100644 (file)
--- a/include/wx/mgl/brush.h
+++ b/include/wx/mgl/brush.h
@@ -20,8 +20,8 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBrush;
 
 //-----------------------------------------------------------------------------
 // wxBrush
@@ -33,19 +33,18 @@ public:
     wxBrush() {}
     wxBrush(const wxColour &colour, int style = wxSOLID);
     wxBrush(const wxBitmap &stippleBitmap);
-    wxBrush(const wxBrush &brush);
-    ~wxBrush() {}
-    wxBrush& operator = (const wxBrush& brush);
+    virtual ~wxBrush() {}
     bool operator == (const wxBrush& brush) const;
     bool operator != (const wxBrush& brush) const;
-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;
 
     virtual int GetStyle() const;
     wxColour &GetColour() const;
     wxBitmap *GetStipple() const;
 
     void SetColour(const wxColour& col);
-    void SetColour(const unsigned char r, const unsigned char g, const unsigned char b);
+    void SetColour(unsigned char r, unsigned char g, unsigned char b);
     void SetStyle(int style);
     void SetStipple(const wxBitmap& stipple);