many compilation fixes for WinCE using VC8 (it now build, although still doesn't work)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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 )
|
||||
|
Reference in New Issue
Block a user