X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b823f5a145f4823ce823591824855c34204936e4..5c5ab9ebc3a7dd441c9e3b25cb3daf8f733c374f:/src/msw/brush.cpp diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp index 3f31a36166..7e107855c9 100644 --- a/src/msw/brush.cpp +++ b/src/msw/brush.cpp @@ -33,9 +33,7 @@ #include "assert.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject) -#endif wxBrushRefData::wxBrushRefData(void) { @@ -84,20 +82,6 @@ wxBrush::wxBrush(const wxColour& col, int Style) wxTheBrushList->AddBrush(this); } -wxBrush::wxBrush(const wxString& col, int Style) -{ - m_refData = new wxBrushRefData; - - M_BRUSHDATA->m_colour = col; - M_BRUSHDATA->m_style = Style; - M_BRUSHDATA->m_hBrush = 0; - - RealizeResource(); - - if ( wxTheBrushList ) - wxTheBrushList->AddBrush(this); -} - wxBrush::wxBrush(const wxBitmap& stipple) { m_refData = new wxBrushRefData; @@ -182,7 +166,7 @@ WXHANDLE wxBrush::GetResourceHandle(void) return (WXHANDLE) M_BRUSHDATA->m_hBrush; } -bool wxBrush::FreeResource(bool force) +bool wxBrush::FreeResource(bool WXUNUSED(force)) { if (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush != 0)) { @@ -193,7 +177,7 @@ bool wxBrush::FreeResource(bool force) else return FALSE; } -bool wxBrush::IsFree(void) +bool wxBrush::IsFree() const { return (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush == 0)); } @@ -223,16 +207,7 @@ void wxBrush::SetColour(const wxColour& col) RealizeResource(); } -void wxBrush::SetColour(const wxString& col) -{ - Unshare(); - - M_BRUSHDATA->m_colour = col; - - RealizeResource(); -} - -void wxBrush::SetColour(const unsigned char r, const unsigned char g, const unsigned char b) +void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b) { Unshare();