X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f11896042326e05d5c717159f9a7e6fd9f6bc404..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/msw/app.cpp diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 8d6c1c67cc..529d6688c0 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -280,27 +280,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv) } #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__) InitCommonControls(); #endif // __WIN95__ @@ -644,7 +623,6 @@ int wxApp::GetComCtl32Version() dvi.dwMinorVersion; } } -//#endif // if DllGetVersion() is unavailable either during compile or // run-time, try to guess the version otherwise