warning fix

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

diff --git a/src/qt/pen.cpp b/src/qt/pen.cpp
index d7b2ce264cb548485b611004010fb563ccf718c9..9ff7032fb2679bd8bf5529700465d736881e7886 100644 (file)
--- a/src/qt/pen.cpp
+++ b/src/qt/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 = (wxQTDash*)NULL;
 /* TODO: null data
     m_hPen = 0;
 */
@@ -78,7 +76,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 = (wxQTDash*)NULL;
 
     RealizeResource();
 
@@ -96,7 +94,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 = (wxQTDash*)NULL;
 
     RealizeResource();
 
@@ -114,7 +112,7 @@ wxPen::wxPen(const wxString& 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 = (wxQTDash*)NULL;
 
     RealizeResource();
 
@@ -197,7 +195,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 = (wxQTDash *)Dash;
   
     RealizeResource();
 }