X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c58338193e8e4219138b9de02d36c4fc4a96feb..25c702609db6a749ffd5f3e659ec348e4aa3a3c8:/src/msw/pen.cpp diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp index cd58107ac9..a43d02b14d 100644 --- a/src/msw/pen.cpp +++ b/src/msw/pen.cpp @@ -206,18 +206,10 @@ wxPenRefData::~wxPenRefData() // wxPenRefData HPEN management // ---------------------------------------------------------------------------- -#ifdef wxHAVE_EXT_CREATE_PEN - static int ConvertPenStyle(int style) { switch ( style ) { - case wxDOT: - return PS_DOT; - - case wxDOT_DASH: - return PS_DASHDOT; - case wxSHORT_DASH: case wxLONG_DASH: return PS_DASH; @@ -225,13 +217,20 @@ static int ConvertPenStyle(int style) case wxTRANSPARENT: return PS_NULL; - case wxUSER_DASH: - return PS_USERSTYLE; - default: wxFAIL_MSG( _T("unknown pen style") ); // fall through +#ifdef wxHAVE_EXT_CREATE_PEN + case wxDOT: + return PS_DOT; + + case wxDOT_DASH: + return PS_DASHDOT; + + case wxUSER_DASH: + return PS_USERSTYLE; + case wxSTIPPLE: case wxBDIAGONAL_HATCH: case wxCROSSDIAG_HATCH: @@ -240,10 +239,14 @@ static int ConvertPenStyle(int style) case wxHORIZONTAL_HATCH: case wxVERTICAL_HATCH: case wxSOLID: +#endif // wxHAVE_EXT_CREATE_PEN + return PS_SOLID; } } +#ifdef wxHAVE_EXT_CREATE_PEN + static int ConvertJoinStyle(int join) { switch( join )