X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/004fd0c8834ca526d335a9294322d9def17ef8a9..10992a81d39da31b79063387b7b71c0ff68737ce:/src/os2/pen.cpp?ds=inline diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp index ec5da7deed..1e99b340b2 100644 --- a/src/os2/pen.cpp +++ b/src/os2/pen.cpp @@ -24,9 +24,7 @@ #include "wx/os2/private.h" #include "assert.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) -#endif wxPenRefData::wxPenRefData() { @@ -35,7 +33,7 @@ wxPenRefData::wxPenRefData() m_join = wxJOIN_ROUND ; m_cap = wxCAP_ROUND ; m_nbDash = 0 ; - m_dash = 0 ; + m_dash = (wxPMDash*)NULL; m_hPen = 0; } @@ -84,7 +82,7 @@ wxPen::wxPen(const wxColour& col, int Width, int Style) M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_nbDash = 0 ; - M_PENDATA->m_dash = 0 ; + M_PENDATA->m_dash = (wxPMDash*)NULL; M_PENDATA->m_hPen = 0 ; // TODO: @@ -110,7 +108,7 @@ wxPen::wxPen(const wxBitmap& stipple, int Width) M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_nbDash = 0 ; - M_PENDATA->m_dash = 0 ; + M_PENDATA->m_dash = (wxPMDash*)NULL; M_PENDATA->m_hPen = 0 ; RealizeResource(); @@ -215,7 +213,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash) Unshare(); M_PENDATA->m_nbDash = nb_dashes; - M_PENDATA->m_dash = (wxDash *)Dash; + M_PENDATA->m_dash = (wxPMDash *)Dash; RealizeResource(); } @@ -240,7 +238,7 @@ void wxPen::SetCap(int Cap) int wx2os2PenStyle(int wx_style) { - int cstyle; + int cstyle = 0; // TODO: /* switch (wx_style)