X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbcdf8bc7ca806d8278c7cb6d09d5590378b67d8..bd52bee1062faef26287d2f5a2595a9d8ee4d85a:/include/wx/msw/brush.h diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h index 71367662a4..1ec1b80b7e 100644 --- a/include/wx/msw/brush.h +++ b/include/wx/msw/brush.h @@ -27,6 +27,7 @@ class WXDLLEXPORT wxBrushRefData: public wxGDIRefData friend class WXDLLEXPORT wxBrush; public: wxBrushRefData(void); + wxBrushRefData(const wxBrushRefData& data); ~wxBrushRefData(void); protected: @@ -46,21 +47,18 @@ class WXDLLEXPORT wxBrush: public wxGDIObject public: wxBrush(void); wxBrush(const wxColour& col, int style); - wxBrush(const wxString& col, int style); wxBrush(const wxBitmap& stipple); inline wxBrush(const wxBrush& brush) { Ref(brush); } - inline wxBrush(const wxBrush* brush) { /* UnRef(); */ if (brush) Ref(*brush); } ~wxBrush(void); virtual void SetColour(const wxColour& col) ; - virtual void SetColour(const wxString& 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) ; inline wxBrush& operator = (const wxBrush& brush) { if (*this == brush) return (*this); Ref(brush); return *this; } - inline bool operator == (const wxBrush& brush) { return m_refData == brush.m_refData; } - inline bool operator != (const wxBrush& brush) { return m_refData != brush.m_refData; } + inline bool operator == (const wxBrush& brush) const { return m_refData == brush.m_refData; } + inline bool operator != (const wxBrush& brush) const { return m_refData != brush.m_refData; } inline wxColour& GetColour(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour); }; inline int GetStyle(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); }; @@ -72,12 +70,8 @@ public: bool RealizeResource(void); WXHANDLE GetResourceHandle(void) ; bool FreeResource(bool force = FALSE); -/* - bool UseResource(void); - bool ReleaseResource(void); -*/ - - bool IsFree(void); + bool IsFree() const; + void Unshare(); }; #endif