added wxGetMultiChoice() (which refuses to work for some reason - will fix

[wxWidgets.git] / src / motif / pen.cpp

diff --git a/src/motif/pen.cpp b/src/motif/pen.cpp
index ab5fa850492ddb5049bc82e5a9b7fd4032561dfa..3163d410e4fc02be4c2a51956ee1419008f3dae0 100644 (file)
--- 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();
 }