removed Win16 code (patch 905241), last version with remains of Win16 support tagged with BEFORE_WIN16_REMOVAL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -721,12 +721,7 @@ static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz)
|
||||
unsigned long wxSysErrorCode()
|
||||
{
|
||||
#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
|
||||
#ifdef __WIN32__
|
||||
return ::GetLastError();
|
||||
#else //WIN16
|
||||
// TODO what to do on Windows 3.1?
|
||||
return 0;
|
||||
#endif //WIN16/32
|
||||
#else //Unix
|
||||
return errno;
|
||||
#endif //Win/Unix
|
||||
@@ -739,7 +734,6 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
|
||||
nErrCode = wxSysErrorCode();
|
||||
|
||||
#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
|
||||
#ifdef __WIN32__
|
||||
static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
|
||||
|
||||
// get error message from system
|
||||
@@ -771,11 +765,7 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
|
||||
}
|
||||
|
||||
return s_szBuf;
|
||||
#else //Win16
|
||||
// TODO
|
||||
return NULL;
|
||||
#endif // Win16/32
|
||||
#else // Unix
|
||||
#else // Unix-WXMICROWIN
|
||||
#if wxUSE_UNICODE
|
||||
static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
|
||||
wxConvCurrent->MB2WC(s_szBuf, strerror(nErrCode), WXSIZEOF(s_szBuf) -1);
|
||||
@@ -783,7 +773,7 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
|
||||
#else
|
||||
return strerror((int)nErrCode);
|
||||
#endif
|
||||
#endif // Win/Unix
|
||||
#endif // Win/Unix-WXMICROWIN
|
||||
}
|
||||
|
||||
#endif // wxUSE_LOG
|
||||
|
Reference in New Issue
Block a user