X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..f196316400fd247a760b2ef77d5064b4e10e5471:/include/wx/msw/brush.h?ds=sidebyside diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h index 4452e29c24..6e21585ad1 100644 --- a/include/wx/msw/brush.h +++ b/include/wx/msw/brush.h @@ -16,7 +16,7 @@ #include "wx/gdiobj.h" #include "wx/bitmap.h" -class WXDLLEXPORT wxBrush; +class WXDLLIMPEXP_FWD_CORE wxBrush; // ---------------------------------------------------------------------------- // wxBrush @@ -28,15 +28,13 @@ public: wxBrush(); wxBrush(const wxColour& col, int style = wxSOLID); wxBrush(const wxBitmap& stipple); - wxBrush(const wxBrush& brush) : wxBrushBase(brush) { Ref(brush); } virtual ~wxBrush(); virtual void SetColour(const wxColour& col); - virtual void SetColour(const unsigned char r, const unsigned char g, const unsigned char b); + virtual void SetColour(unsigned char r, unsigned char g, unsigned char b); 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); } @@ -44,7 +42,8 @@ public: 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;