From 07505825dbad2bb0a8ddefd2a1697daaa83a0dde Mon Sep 17 00:00:00 2001
From: =?utf8?q?W=C5=82odzimierz=20Skiba?= <abx@abx.art.pl>
Date: Fri, 28 May 2004 11:08:45 +0000
Subject: [PATCH] Simplified pen style conversion.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/msw/pen.cpp | 55 +++++++++++++++++--------------------------------
1 file changed, 19 insertions(+), 36 deletions(-)
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_DASH:
- cstyle = PS_DASHDOT;
- break;
-
- case wxSHORT_DASH:
- case wxLONG_DASH:
- cstyle = PS_DASH;
- break;
-
- case wxTRANSPARENT:
- cstyle = PS_NULL;
- break;
-#endif
+ case wxDOT:
+ return PS_DOT;
- 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 wxDOT_DASH:
+ return PS_DASHDOT;
+
+ case wxSHORT_DASH:
+ case wxLONG_DASH:
+ return PS_DASH;
+
+ case wxTRANSPARENT:
+ return PS_NULL;
+
+ case wxUSER_DASH:
+ // if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95)
+ return PS_USERSTYLE;
+ }
#else
- cstyle = PS_DASH;
-#endif
+ wxUnusedVar(wx_style);
#endif
- break;
- case wxSOLID:
- default:
- cstyle = PS_SOLID;
- break;
- }
- return cstyle;
+ return PS_SOLID;
}
--
2.47.2