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

check for Unicode being used under Win9x much earlier on startup as otherwise the app crashes before getting to this check

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-06-06 00:03:00 +00:00
parent 72d29cf03b
commit bd86627171
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/msw/app.cpp
View File

@@ -280,27 +280,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
} }
#endif #endif
// the first thing to do is to check if we're trying to run an Unicode
// program under Win9x w/o MSLU emulation layer - if so, abort right now
// as it has no chance to work
#if wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
if ( wxGetOsVersion() != wxWINDOWS_NT && wxGetOsVersion() != wxWINDOWS_CE && wxGetOsVersion() != wxWINDOWS_SMARTPHONE && wxGetOsVersion() != wxWINDOWS_POCKETPC )
{
// note that we can use MessageBoxW() as it's implemented even under
// Win9x - OTOH, we can't use wxGetTranslation() because the file APIs
// used by wxLocale are not
::MessageBox
(
NULL,
_T("This program uses Unicode and requires Windows NT/2000/XP/CE.\nProgram aborted."),
_T("wxWidgets Fatal Error"),
MB_ICONERROR | MB_OK
);
return false;
}
#endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
#if defined(__WIN95__) && !defined(__WXMICROWIN__) #if defined(__WIN95__) && !defined(__WXMICROWIN__)
InitCommonControls(); InitCommonControls();
#endif // __WIN95__ #endif // __WIN95__

22
src/msw/main.cpp
View File

@@ -262,6 +262,28 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
wxCmdLineArgType WXUNUSED(pCmdLine), wxCmdLineArgType WXUNUSED(pCmdLine),
int nCmdShow) int nCmdShow)
{ {
// the first thing to do is to check if we're trying to run an Unicode
// program under Win9x w/o MSLU emulation layer - if so, abort right now
// as it has no chance to work and has all chances to crash
#if wxUSE_UNICODE && !wxUSE_UNICODE_MSLU && !defined(__WXWINCE__)
if ( wxGetOsVersion() != wxWINDOWS_NT )
{
// note that we can use MessageBoxW() as it's implemented even under
// Win9x - OTOH, we can't use wxGetTranslation() because the file APIs
// used by wxLocale are not
::MessageBox
(
NULL,
_T("This program uses Unicode and requires Windows NT/2000/XP.\nProgram aborted."),
_T("wxWidgets Fatal Error"),
MB_ICONERROR | MB_OK
);
return -1;
}
#endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
// remember the parameters Windows gave us // remember the parameters Windows gave us
wxSetInstance(hInstance); wxSetInstance(hInstance);
wxApp::m_nCmdShow = nCmdShow; wxApp::m_nCmdShow = nCmdShow;