From 286b8de534e1d0b55c7943d00af23d29f02efab1 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@bullseye.com>
Date: Thu, 17 Aug 2006 18:48:03 +0000
Subject: [PATCH] remove Win32S-specific code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/gdiimage.cpp |  2 +-
 src/msw/pen.cpp      | 30 +++++++++---------------------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index df4910d8cc..53b15e9dd7 100644
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -572,7 +572,7 @@ wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon))
     wxSize size(::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON));
 
 #ifndef __WXWINCE__
-    if ( hicon && wxGetOsVersion() != wxWIN32S )
+    if (hicon)
     {
         ICONINFO info;
         if ( !::GetIconInfo(hicon, &info) )
diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index db0c66fd58..92b08327a6 100644
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -225,25 +225,14 @@ bool wxPen::RealizeResource()
            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;
    }
@@ -389,8 +378,7 @@ int wx2msPenStyle(int wx_style)
             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);
-- 
2.45.2