fix from Robert for extra refreshes

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

diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp
index 48da7cb43436b3941cfab29db6dfffc514645961..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"
 
 #include "wx/os2/private.h"
 #include "assert.h"
 

+IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
+

 wxPenRefData::wxPenRefData()
 {
     m_style = wxSOLID;
 wxPenRefData::wxPenRefData()
 {
     m_style = wxSOLID;


@@ -31,7 +33,7 @@ wxPenRefData::wxPenRefData()
     m_join = wxJOIN_ROUND ;
     m_cap = wxCAP_ROUND ;
     m_nbDash = 0 ;
     m_join = wxJOIN_ROUND ;
     m_cap = wxCAP_ROUND ;
     m_nbDash = 0 ;

-    m_dash = 0 ;
+    m_dash = (wxPMDash*)NULL;

     m_hPen = 0;
 }
 
     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_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:
     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_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();
     M_PENDATA->m_hPen = 0 ;
 
     RealizeResource();


@@ -140,6 +142,11 @@ bool wxPen::FreeResource(bool force)
     else return FALSE;
 }
 
     else return FALSE;
 }
 

+bool wxPen::IsFree() const
+{
+  return (M_PENDATA && M_PENDATA->m_hPen == 0);
+}
+

 void wxPen::Unshare()
 {
     // Don't change shared data
 void wxPen::Unshare()
 {
     // Don't change shared data


@@ -206,7 +213,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
     Unshare();
 
     M_PENDATA->m_nbDash = nb_dashes;
     Unshare();
 
     M_PENDATA->m_nbDash = nb_dashes;

-    M_PENDATA->m_dash = (wxDash *)Dash;
+    M_PENDATA->m_dash = (wxPMDash *)Dash;

 
     RealizeResource();
 }
 
     RealizeResource();
 }


@@ -231,7 +238,7 @@ void wxPen::SetCap(int Cap)
 
 int wx2os2PenStyle(int wx_style)
 {
 
 int wx2os2PenStyle(int wx_style)
 {

-    int cstyle;
+    int cstyle = 0;

 // TODO:
 /*
     switch (wx_style)
 // TODO:
 /*
     switch (wx_style)