class wxBrushRefData : public wxGDIRefData
{
public:
- wxBrushRefData(const wxColour& clr = wxNullColour, int style = wxSOLID)
+ wxBrushRefData(const wxColour& clr = wxNullColour, wxBrushStyle style = wxBRUSHSTYLE_SOLID)
{
m_colour = clr;
SetStyle(style);
virtual bool IsOk() const { return m_colour.IsOk(); }
- void SetStyle(int style)
+ void SetStyle(wxBrushStyle style)
{
if ( style != wxSOLID && style != wxTRANSPARENT )
{
wxFAIL_MSG( wxT("only wxSOLID and wxTRANSPARENT styles are supported") );
- style = wxSOLID;
+ style = wxBRUSHSTYLE_SOLID;
}
m_style = style;
}
wxColour m_colour;
- int m_style;
+ wxBrushStyle m_style;
};
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
-wxBrush::wxBrush(const wxColour &colour, int style)
+wxBrush::wxBrush(const wxColour &colour, wxBrushStyle style)
{
m_refData = new wxBrushRefData(colour, style);
}
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxBrush::wxBrush(const wxColour& col, int style)
+{
+ m_refData = new wxBrushRefData(col, (wxBrushStyle)style);
+}
+#endif
+
wxBrush::wxBrush(const wxBitmap &stippleBitmap)
{
wxFAIL_MSG( wxT("brushes with stipple bitmaps not implemented") );
return m_refData == brush.m_refData;
}
-int wxBrush::GetStyle() const
+wxBrushStyle wxBrush::GetStyle() const
{
- if (m_refData == NULL)
- {
- wxFAIL_MSG( wxT("invalid brush") );
- return 0;
- }
+ wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, _T("invalid brush") );
return M_BRUSHDATA->m_style;
}
-wxColour& wxBrush::GetColour() const
+wxColour wxBrush::GetColour() const
{
- if (m_refData == NULL)
- {
- wxFAIL_MSG( wxT("invalid brush") );
- return wxNullColour;
- }
+ wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") );
return M_BRUSHDATA->m_colour;
}
M_BRUSHDATA->m_colour.Set(r, g, b);
}
-void wxBrush::SetStyle(int style)
+void wxBrush::SetStyle(wxBrushStyle style)
{
AllocExclusive();
M_BRUSHDATA->SetStyle(style);