Various compile fixes.

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

diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index b764f03bea476c26b1328e0ed70866e70c770e62..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_dash = (wxMSWDash*)NULL;
+  m_dash = (wxDash*)NULL;
   m_hPen = 0;
 }
 
@@ -67,14 +67,10 @@ wxPenRefData::~wxPenRefData()
 
 wxPen::wxPen()
 {
-  if (wxThePenList)
-    wxThePenList->AddPen(this);
 }
 
 wxPen::~wxPen()
 {
-    if (wxThePenList)
-        wxThePenList->RemovePen(this);
 }
 
 // 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_dash = (wxMSWDash*)NULL;
+  M_PENDATA->m_dash = (wxDash*)NULL;
   M_PENDATA->m_hPen = 0 ;
 
 #ifndef __WIN32__
@@ -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)
@@ -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_dash = (wxMSWDash*)NULL;
+    M_PENDATA->m_dash = (wxDash*)NULL;
     M_PENDATA->m_hPen = 0 ;
 
     RealizeResource();
 
-    if (wxThePenList)
-       wxThePenList->AddPen(this);
 }
 
 bool wxPen::RealizeResource()
@@ -157,7 +149,7 @@ bool wxPen::RealizeResource()
        // Join style, Cap style, Pen Stippling only on Win32.
        // Currently no time to find equivalent on Win3.1, sorry
        // [if such equiv exist!!]
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
        if (M_PENDATA->m_join==wxJOIN_ROUND        &&
            M_PENDATA->m_cap==wxCAP_ROUND          &&
            M_PENDATA->m_style!=wxUSER_DASH        &&
@@ -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];
-               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
@@ -377,7 +368,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
     Unshare();
 
     M_PENDATA->m_nbDash = nb_dashes;
-    M_PENDATA->m_dash = (wxMSWDash *)Dash;
+    M_PENDATA->m_dash = (wxDash *)Dash;
 
     RealizeResource();
 }
@@ -405,6 +396,7 @@ int wx2msPenStyle(int wx_style)
     int cstyle;
     switch (wx_style)
     {
+#if !defined(__WXMICROWIN__)
        case wxDOT:
            cstyle = PS_DOT;
            break;
@@ -421,8 +413,10 @@ int wx2msPenStyle(int wx_style)
        case wxTRANSPARENT:
            cstyle = PS_NULL;
            break;
+#endif
 
        case wxUSER_DASH:
+#if !defined(__WXMICROWIN__)
 #ifdef __WIN32__
            // Win32s doesn't have PS_USERSTYLE
            if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95)
@@ -431,6 +425,7 @@ int wx2msPenStyle(int wx_style)
                cstyle = PS_DOT; // We must make a choice... This is mine!
 #else
            cstyle = PS_DASH;
+#endif
 #endif
            break;
        case wxSOLID: