diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index 3196fc92c7..e79ddf7de7 100644
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -394,46 +394,29 @@ void wxPen::SetCap(int Cap)
 
 int wx2msPenStyle(int wx_style)
 {
-    int cstyle = PS_SOLID;
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     switch (wx_style)
     {
-#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
-       case wxDOT:
-           cstyle = PS_DOT;
-           break;
+        case wxDOT:
+            return PS_DOT;
 
-       case wxDOT_DASH:
-           cstyle = PS_DASHDOT;
-           break;
+        case wxDOT_DASH:
+            return PS_DASHDOT;
 
-       case wxSHORT_DASH:
-       case wxLONG_DASH:
-           cstyle = PS_DASH;
-           break;
+        case wxSHORT_DASH:
+        case wxLONG_DASH:
+            return PS_DASH;
 
-       case wxTRANSPARENT:
-           cstyle = PS_NULL;
-           break;
-#endif
+        case wxTRANSPARENT:
+            return PS_NULL;
 
-       case wxUSER_DASH:
-#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
-#ifdef __WIN32__
-           // Win32s doesn't have PS_USERSTYLE
-           if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95)
-               cstyle = PS_USERSTYLE;
-           else
-               cstyle = PS_DOT; // We must make a choice... This is mine!
+        case wxUSER_DASH:
+            // if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95)
+                return PS_USERSTYLE;
+    }
 #else
-           cstyle = PS_DASH;
+    wxUnusedVar(wx_style);
 #endif
-#endif
-           break;
-       case wxSOLID:
-       default:
-           cstyle = PS_SOLID;
-           break;
-   }
-   return cstyle;
+    return PS_SOLID;
 }