Merged some STC fixes over to the main branch

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

diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp
index c3d18a0378e37fd6b87f1d81ff71d9ec1eb0d1c2..1e99b340b287a0c579d6bfb1f6f5fb76eb8935c1 100644 (file)
--- a/src/os2/pen.cpp
+++ b/src/os2/pen.cpp
@@ -24,6 +24,8 @@
 #include "wx/os2/private.h"
 #include "assert.h"
 
+IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
+
 wxPenRefData::wxPenRefData()
 {
     m_style = wxSOLID;
@@ -31,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;
 }
 
@@ -80,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:
@@ -106,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();
@@ -211,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();
 }
@@ -236,7 +238,7 @@ void wxPen::SetCap(int Cap)
 
 int wx2os2PenStyle(int wx_style)
 {
-    int cstyle;
+    int cstyle = 0;
 // TODO:
 /*
     switch (wx_style)