X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6783cae428bd825191040780017f4a0b4599d8ff..3e6858cdcb9278b36446466c346d984e7e306553:/src/x11/brush.cpp diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp index 7ac5842b35..4a45842abf 100644 --- a/src/x11/brush.cpp +++ b/src/x11/brush.cpp @@ -46,9 +46,9 @@ public: m_colour == data.m_colour); } - int m_style; - wxColour m_colour; - wxBitmap m_stipple; + wxBrushStyle m_style; + wxColour m_colour; + wxBitmap m_stipple; }; //----------------------------------------------------------------------------- @@ -57,7 +57,7 @@ public: IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject) -wxBrush::wxBrush( const wxColour &colour, int style ) +wxBrush::wxBrush( const wxColour &colour, wxBrushStyle style ) { m_refData = new wxBrushRefData(); M_BRUSHDATA->m_style = style; @@ -101,7 +101,7 @@ bool wxBrush::operator == ( const wxBrush& brush ) const return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData ); } -int wxBrush::GetStyle() const +wxBrushStyle wxBrush::GetStyle() const { if (m_refData == NULL) { @@ -148,7 +148,7 @@ void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b ) M_BRUSHDATA->m_colour.Set( r, g, b ); } -void wxBrush::SetStyle( int style ) +void wxBrush::SetStyle( wxBrushStyle style ) { AllocExclusive();