More bakfile changes needed for bmpcbox. Rebaked.

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

diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index db0c66fd58ca499b93c7e6238fea8a8513a8c95d..92b08327a6c1d61161dea3af5eeca43fe7458ad4 100644 (file)
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -225,25 +225,14 @@ bool wxPen::RealizeResource()
            real_dash = (wxMSWDash*)NULL;
        }
 
            real_dash = (wxMSWDash*)NULL;
        }
 

-       // Win32s doesn't have ExtCreatePen function...
-       if (os == wxOS_WINDOWS_NT || os == wxOS_WINDOWS_9X)
-       {
-           M_PENDATA->m_hPen =
-             (WXHPEN) ExtCreatePen( ms_style,
-                                    M_PENDATA->m_width,
-                                    &logb,
-                                    M_PENDATA->m_style == wxUSER_DASH
-                                      ? M_PENDATA->m_nbDash
-                                      : 0,
-                                    (LPDWORD)real_dash );
-       }
-       else
-       {
-           M_PENDATA->m_hPen =
-              (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style),
-                                  M_PENDATA->m_width,
-                                  ms_colour );
-       }
+       M_PENDATA->m_hPen =
+         (WXHPEN) ExtCreatePen( ms_style,
+                                M_PENDATA->m_width,
+                                &logb,
+                                M_PENDATA->m_style == wxUSER_DASH
+                                  ? M_PENDATA->m_nbDash
+                                  : 0,
+                                (LPDWORD)real_dash );

 
        delete [] real_dash;
    }
 
        delete [] real_dash;
    }


@@ -389,8 +378,7 @@ int wx2msPenStyle(int wx_style)
             return PS_NULL;
 
         case wxUSER_DASH:
             return PS_NULL;
 
         case wxUSER_DASH:

-            // if (wxGetOsVersion()==wxOS_WINDOWS_NT || wxGetOsVersion()==wxOS_WINDOWS_9X)
-                return PS_USERSTYLE;
+            return PS_USERSTYLE;

     }
 #else
     wxUnusedVar(wx_style);
     }
 #else
     wxUnusedVar(wx_style);