X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec5006bdc630dd6b3d4cad1a3b572ab4c695a029..ae46a7fd15bff134460b9af46af896136b018fad:/src/dfb/brush.cpp?ds=sidebyside diff --git a/src/dfb/brush.cpp b/src/dfb/brush.cpp index 93209e3362..6d310fc0bd 100644 --- a/src/dfb/brush.cpp +++ b/src/dfb/brush.cpp @@ -26,7 +26,7 @@ // wxBrush //----------------------------------------------------------------------------- -class wxBrushRefData: public wxObjectRefData +class wxBrushRefData : public wxGDIRefData { public: wxBrushRefData(const wxColour& clr = wxNullColour, int style = wxSOLID) @@ -41,6 +41,8 @@ public: m_style = data.m_style; } + virtual bool IsOk() const { return m_colour.IsOk(); } + void SetStyle(int style) { if ( style != wxSOLID && style != wxTRANSPARENT ) @@ -80,11 +82,6 @@ bool wxBrush::operator==(const wxBrush& brush) const return m_refData == brush.m_refData; } -bool wxBrush::IsOk() const -{ - return ((m_refData) && M_BRUSHDATA->m_colour.Ok()); -} - int wxBrush::GetStyle() const { if (m_refData == NULL) @@ -136,12 +133,12 @@ void wxBrush::SetStipple(const wxBitmap& WXUNUSED(stipple)) wxFAIL_MSG( wxT("brushes with stipple bitmaps not implemented") ); } -wxObjectRefData *wxBrush::CreateRefData() const +wxGDIRefData *wxBrush::CreateGDIRefData() const { return new wxBrushRefData; } -wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const +wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const { return new wxBrushRefData(*(wxBrushRefData *)data); }