test whether HAVE_VSWPRINTF is defined, not whether it's 0 or 1

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

diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index c51b948fedab39e33fc32e7b5d7c8556850761dc..3500cbf3b37c8cd70dd9535547d7a4c3505f9440 100644 (file)
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -12,10 +12,6 @@
 #ifndef _WX_BRUSH_H_
 #define _WX_BRUSH_H_
 
-#ifdef __GNUG__
-    #pragma interface "brush.h"
-#endif
-
 #include "wx/gdicmn.h"
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
@@ -26,13 +22,12 @@ class WXDLLEXPORT wxBrush;
 // wxBrush
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxBrush : public wxGDIObject
+class WXDLLEXPORT wxBrush : public wxBrushBase
 {
 public:
     wxBrush();
     wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);
-    wxBrush(const wxBrush& brush) { Ref(brush); }
     virtual ~wxBrush();
 
     virtual void SetColour(const wxColour& col);
@@ -40,15 +35,15 @@ public:
     virtual void SetStyle(int style);
     virtual void SetStipple(const wxBitmap& stipple);
 
-    wxBrush& operator=(const wxBrush& brush);
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     wxColour GetColour() const;
-    int GetStyle() const;
+    virtual int GetStyle() const;
     wxBitmap *GetStipple() const;
 
-    bool Ok() const { return m_refData != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }
 
     // return the HBRUSH for this brush
     virtual WXHANDLE GetResourceHandle() const;