X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/39ea2103cdaadd61974b9746cac2315183ef6720..65c11337559c3b95e86d38723c37ca6b10a2bd5b:/src/msw/main.cpp diff --git a/src/msw/main.cpp b/src/msw/main.cpp index c86c0909eb..ef89ba1061 100644 --- a/src/msw/main.cpp +++ b/src/msw/main.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/main.cpp +// Name: src/msw/main.cpp // Purpose: WinMain/DllMain // Author: Julian Smart // Modified by: @@ -24,8 +24,12 @@ #pragma hdrstop #endif -#include "wx/event.h" -#include "wx/app.h" +#ifndef WX_PRECOMP + #include "wx/event.h" + #include "wx/app.h" + #include "wx/utils.h" +#endif //WX_PRECOMP + #include "wx/cmdline.h" #include "wx/scopeguard.h" @@ -75,8 +79,8 @@ extern int wxEntryReal(int& argc, wxChar **argv); // this warns that /EHa (async exceptions) should be used when using // _set_se_translator but, in fact, this doesn't seem to change anything - // with VC++ up to 7.1 -- to be confirmed with VC++ 8 - #if _MSC_VER <= 1310 + // with VC++ up to 8.0 + #if _MSC_VER <= 1400 #pragma warning(disable:4535) #endif @@ -181,7 +185,7 @@ bool wxHandleFatalExceptions(bool doit) wxString name = wxString::Format ( _T("%s_%s_%lu.dmp"), - wxTheApp ? wxTheApp->GetAppName().c_str() + wxTheApp ? (const wxChar*)wxTheApp->GetAppName().c_str() : _T("wxwindows"), wxDateTime::Now().Format(_T("%Y%m%dT%H%M%S")).c_str(), ::GetCurrentProcessId() @@ -244,10 +248,10 @@ static bool wxIsUnicodeAvailable() { static const wchar_t *ERROR_STRING = L"wxWidgets Fatal Error"; - if ( wxGetOsVersion() != wxWINDOWS_NT ) + if ( wxGetOsVersion() != wxOS_WINDOWS_NT ) { // we need to be built with MSLU support -#if !wxUSE_UNICODE_MSLU +#if !wxUSE_UNICODE_MSLU // 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 @@ -403,4 +407,3 @@ void wxSetInstance(HINSTANCE hInst) } #endif // wxUSE_BASE -