m_style = wxPENSTYLE_SOLID;
m_joinStyle = wxJOIN_ROUND;
m_capStyle = wxCAP_ROUND;
- m_dash = (wxDash*) NULL;
+ m_dash = NULL;
m_countDashes = 0;
int x, y, c;
M_PENDATA->m_colour = colour;
}
-wxPen::wxPen(const wxColour& colour, int width, wxBrushStyle style)
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxPen::wxPen(const wxColour& colour, int width, int style)
{
m_refData = new wxPenRefData();
M_PENDATA->m_width = width;
M_PENDATA->m_style = (wxPenStyle)style;
M_PENDATA->m_colour = colour;
}
+#endif
wxPen::wxPen(const wxBitmap& stipple, int width)
{
int wxPen::GetDashes(wxDash **ptr) const
{
- *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
- return (M_PENDATA ? M_PENDATA->m_countDashes : 0);
+ wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+
+ *ptr = (wxDash*)M_PENDATA->m_dash;
+ return M_PENDATA->m_countDashes;
}
int wxPen::GetDashCount() const
{
+ wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+
return (M_PENDATA->m_countDashes);
}
wxDash* wxPen::GetDash() const
{
+ wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") );
+
return (wxDash*)M_PENDATA->m_dash;
}
return M_PENDATA->m_width;
}
-wxColour &wxPen::GetColour() const
+wxColour wxPen::GetColour() const
{
wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );