Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplified pen style conversion.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-05-28 11:08:45 +00:00
parent 30deac1fa5
commit 07505825db
1 changed files with 16 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/msw/pen.cpp
View File

@@ -394,46 +394,29 @@ void wxPen::SetCap(int Cap)
int wx2msPenStyle(int wx_style) int wx2msPenStyle(int wx_style)
{ {
int cstyle = PS_SOLID; #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
switch (wx_style) switch (wx_style)
{ {
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) case wxDOT:
case wxDOT: return PS_DOT;
cstyle = PS_DOT;
break;
case wxDOT_DASH: case wxDOT_DASH:
cstyle = PS_DASHDOT; return PS_DASHDOT;
break;
case wxSHORT_DASH: case wxSHORT_DASH:
case wxLONG_DASH: case wxLONG_DASH:
cstyle = PS_DASH; return PS_DASH;
break;
case wxTRANSPARENT: case wxTRANSPARENT:
cstyle = PS_NULL; return PS_NULL;
break;
#endif
case wxUSER_DASH: case wxUSER_DASH:
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) // if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95)
#ifdef __WIN32__ return PS_USERSTYLE;
// 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!
#else #else
cstyle = PS_DASH; wxUnusedVar(wx_style);
#endif #endif
#endif return PS_SOLID;
break;
case wxSOLID:
default:
cstyle = PS_SOLID;
break;
}
return cstyle;
} }