treectrl -> treetest

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

diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index e07b7a1e76b213017ee76d1a6d6464cf81ce80b8..599d747603eed4aa915ff34f9cab3a3186759a3a 100644 (file)
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -41,7 +41,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 = (wxMSWDash*)NULL;
+  m_dash = (wxDash*)NULL;

   m_hPen = 0;
 }
 
   m_hPen = 0;
 }
 


@@ -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


@@ -89,7 +85,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 = (wxMSWDash*)NULL;
+  M_PENDATA->m_dash = (wxDash*)NULL;

   M_PENDATA->m_hPen = 0 ;
 
 #ifndef __WIN32__
   M_PENDATA->m_hPen = 0 ;
 
 #ifndef __WIN32__


@@ -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)


@@ -132,13 +126,11 @@ 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 = (wxMSWDash*)NULL;
+    M_PENDATA->m_dash = (wxDash*)NULL;

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


@@ -377,7 +368,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 = (wxMSWDash *)Dash;
+    M_PENDATA->m_dash = (wxDash *)Dash;

 
     RealizeResource();
 }
 
     RealizeResource();
 }