X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..38a097f588121ffcab2fa57e4494a6d0783c3567:/include/wx/msw/brush.h diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h index 842e259d27..4a83d7b57d 100644 --- 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); + 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,12 +35,11 @@ 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; }