make wxTmemchr() return (and take) char* instead of void* in ANSI build too

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

diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h
index 2e46a0a9a478bea62b82c5e82f6278a2bc2130e5..64bf2802f3abf525a96c34478061e1b76dabb327 100644 (file)
--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/brush.h
+// Name:        wx/gtk1/brush.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -21,7 +21,7 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBrush;
 
 //-----------------------------------------------------------------------------
 // wxBrush
@@ -34,14 +34,10 @@ public:
 
     wxBrush( const wxColour &colour, int style = wxSOLID );
     wxBrush( const wxBitmap &stippleBitmap );
-    ~wxBrush();
+    virtual ~wxBrush();
 
-    wxBrush( const wxBrush &brush )
-        : wxBrushBase()
-        { Ref(brush); }
-    wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; }
-
-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }
 
     bool operator == ( const wxBrush& brush ) const;
     bool operator != (const wxBrush& brush) const { return !(*this == brush); }
@@ -51,7 +47,7 @@ public:
     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 );