X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4bb6408c2631988fab9925014c6619358bf867de..184b5d99a5382cd7a19888c85aff11f8a21af2f6:/src/motif/brush.cpp diff --git a/src/motif/brush.cpp b/src/motif/brush.cpp index 45a73b74af..804bcaaa3e 100644 --- a/src/motif/brush.cpp +++ b/src/motif/brush.cpp @@ -24,7 +24,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject) wxBrushRefData::wxBrushRefData() { m_style = wxSOLID; -// TODO: null data } wxBrushRefData::wxBrushRefData(const wxBrushRefData& data) @@ -32,14 +31,10 @@ wxBrushRefData::wxBrushRefData(const wxBrushRefData& data) m_style = data.m_style; m_stipple = data.m_stipple; m_colour = data.m_colour; -/* TODO: null data - m_hBrush = 0; -*/ } wxBrushRefData::~wxBrushRefData() { -// TODO: delete data } // Brushes @@ -68,20 +63,6 @@ wxBrush::wxBrush(const wxColour& col, int Style) wxTheBrushList->AddBrush(this); } -wxBrush::wxBrush(const wxString& col, int Style) -{ - m_refData = new wxBrushRefData; - - // Implicit conversion from string to wxColour via colour database - M_BRUSHDATA->m_colour = col; - M_BRUSHDATA->m_style = Style; - - RealizeResource(); - - if ( wxTheBrushList ) - wxTheBrushList->AddBrush(this); -} - wxBrush::wxBrush(const wxBitmap& stipple) { m_refData = new wxBrushRefData; @@ -119,16 +100,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(); @@ -155,8 +127,9 @@ void wxBrush::SetStipple(const wxBitmap& Stipple) RealizeResource(); } -void wxBrush::RealizeResource() +bool wxBrush::RealizeResource() { -// TODO: create the brush + // Nothing more to do + return TRUE; }