X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d120f8391920145647ec10e84629bc21fa9f1bb..4e0e692f033442a2f700771a209ca08e538411b0:/src/motif/pen.cpp diff --git a/src/motif/pen.cpp b/src/motif/pen.cpp index ab5fa85049..3163d410e4 100644 --- a/src/motif/pen.cpp +++ b/src/motif/pen.cpp @@ -17,9 +17,7 @@ #include "wx/utils.h" #include "wx/pen.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) -#endif wxPenRefData::wxPenRefData() { @@ -28,7 +26,7 @@ wxPenRefData::wxPenRefData() m_join = wxJOIN_ROUND ; m_cap = wxCAP_ROUND ; m_nbDash = 0 ; - m_dash = 0 ; + m_dash = (wxMOTIFDash*)NULL; } wxPenRefData::wxPenRefData(const wxPenRefData& data) @@ -71,11 +69,11 @@ 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 = (wxMOTIFDash*)NULL; RealizeResource(); - if ( wxThePenList ) + if (wxThePenList) wxThePenList->AddPen(this); } @@ -89,7 +87,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 = (wxMOTIFDash*)NULL; RealizeResource(); @@ -163,7 +161,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 = (wxMOTIFDash *)Dash; RealizeResource(); }