another segfault fix

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

diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index 3149b72ecfa45aafafd583ca921d71846e537d76..599d747603eed4aa915ff34f9cab3a3186759a3a 100644 (file)
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -67,14 +67,10 @@ wxPenRefData::~wxPenRefData()
 
 wxPen::wxPen()
 {
 
 wxPen::wxPen()
 {

-  if (wxThePenList)
-    wxThePenList->AddPen(this);

 }
 
 wxPen::~wxPen()
 {
 }
 
 wxPen::~wxPen()
 {

-    if (wxThePenList)
-        wxThePenList->RemovePen(this);

 }
 
 // Should implement Create
 }
 
 // Should implement Create


@@ -117,8 +113,6 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
 #endif
   RealizeResource();
 
 #endif
   RealizeResource();
 

-  if ( wxThePenList )
-    wxThePenList->AddPen(this);

 }
 
 wxPen::wxPen(const wxBitmap& stipple, int Width)
 }
 
 wxPen::wxPen(const wxBitmap& stipple, int Width)


@@ -137,8 +131,6 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
 
     RealizeResource();
 
 
     RealizeResource();
 

-    if (wxThePenList)
-       wxThePenList->AddPen(this);

 }
 
 bool wxPen::RealizeResource()
 }
 
 bool wxPen::RealizeResource()


@@ -240,8 +232,7 @@ bool wxPen::RealizeResource()
            if (M_PENDATA->m_style==wxUSER_DASH && M_PENDATA->m_nbDash && M_PENDATA->m_dash)
            {
                real_dash = new wxMSWDash[M_PENDATA->m_nbDash];
            if (M_PENDATA->m_style==wxUSER_DASH && M_PENDATA->m_nbDash && M_PENDATA->m_dash)
            {
                real_dash = new wxMSWDash[M_PENDATA->m_nbDash];

-               int i, dsh;
-               for (i=0; i<M_PENDATA->m_nbDash; i++)
+               for ( int i = 0; i < M_PENDATA->m_nbDash; i++ )

                    real_dash[i] = M_PENDATA->m_dash[i] * M_PENDATA->m_width;
            }
            else
                    real_dash[i] = M_PENDATA->m_dash[i] * M_PENDATA->m_width;
            }
            else