X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edd971741e8778de6b709f0a4aa59e5b5f93e54e..b8d24d4edd1f91339918134d2420af39c324aa1f:/src/msw/pen.cpp?ds=sidebyside

diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index 3149b72ecf..a7dc903a5d 100644
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -67,14 +67,10 @@ wxPenRefData::~wxPenRefData()
 
 wxPen::wxPen()
 {
-  if (wxThePenList)
-    wxThePenList->AddPen(this);
 }
 
 wxPen::~wxPen()
 {
-    if (wxThePenList)
-        wxThePenList->RemovePen(this);
 }
 
 // Should implement Create
@@ -117,8 +113,6 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
 #endif
   RealizeResource();
 
-  if ( wxThePenList )
-    wxThePenList->AddPen(this);
 }
 
 wxPen::wxPen(const wxBitmap& stipple, int Width)
@@ -137,8 +131,6 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
 
     RealizeResource();
 
-    if (wxThePenList)
-       wxThePenList->AddPen(this);
 }
 
 bool wxPen::RealizeResource()
@@ -240,9 +232,9 @@ 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];
-               int i, dsh;
-               for (i=0; i<M_PENDATA->m_nbDash; i++)
-                   real_dash[i] = M_PENDATA->m_dash[i] * M_PENDATA->m_width;
+               int rw = M_PENDATA->m_width > 1 ? M_PENDATA->m_width : 1;
+               for ( int i = 0; i < M_PENDATA->m_nbDash; i++ )
+                   real_dash[i] = M_PENDATA->m_dash[i] * rw;
            }
            else
            {
@@ -287,7 +279,7 @@ bool wxPen::RealizeResource()
     return FALSE;
 }
 
-WXHANDLE wxPen::GetResourceHandle()
+WXHANDLE wxPen::GetResourceHandle() const
 {
         if ( !M_PENDATA )
                 return 0;