X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..f196316400fd247a760b2ef77d5064b4e10e5471:/include/wx/msw/brush.h diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h index 842e259d27..6e21585ad1 100644 --- a/include/wx/msw/brush.h +++ b/include/wx/msw/brush.h @@ -12,27 +12,22 @@ #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" -class WXDLLEXPORT wxBrush; +class WXDLLIMPEXP_FWD_CORE 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,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;