Hopefully fixed library names generated by wx-config for OS/2's PM port.

[wxWidgets.git] / src / msw / main.cpp

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 15741e3ed70ff1c403e17490705d1c8b1f1ba40d..577873e340989c39537fe69b98fa125977c5b258 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -70,7 +70,7 @@ extern int wxEntryReal(int& argc, wxChar **argv);
 
 #if wxUSE_BASE
 
-#ifdef __VISUALC__
+#if wxUSE_ON_FATAL_EXCEPTION && defined(__VISUALC__) && !defined(__WXWINCE__)
     // VC++ (at least from 4.0 up to version 7.1) is incredibly broken in that
     // a "catch ( ... )" will *always* catch SEH exceptions in it even though
     // it should have never been the case... to prevent such catches from
@@ -93,7 +93,7 @@ extern int wxEntryReal(int& argc, wxChar **argv);
 #endif // __VISUALC__/!__VISUALC__
 
 // ----------------------------------------------------------------------------
-// wrapper wxEntry catching all Win32 exceptions occuring in a wx program
+// wrapper wxEntry catching all Win32 exceptions occurring in a wx program
 // ----------------------------------------------------------------------------
 
 // wrap real wxEntry in a try-except block to be able to call
@@ -219,14 +219,17 @@ int wxEntry(int& argc, wxChar **argv)
     {
         wxFatalExit();
 
-        // this code is unreachable but put it here to suppress warnings
+#if !defined(_MSC_VER) || defined(__WXDEBUG__) || (defined(_MSC_VER) && _MSC_VER <= 1200)
+        // this code is unreachable but put it here to suppress warnings in some compilers
+        // and disable for others to supress warnings too
         return -1;
+#endif // !__VISUALC__ in release build
     }
 }
 
 #else // !wxUSE_ON_FATAL_EXCEPTION
 
-#ifdef __VISUALC__
+#if defined(__VISUALC__) && !defined(__WXWINCE__)
 
 static void
 wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS * WXUNUSED(ep))
@@ -239,9 +242,7 @@ wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS * WXUNUSED(ep))
 
 int wxEntry(int& argc, wxChar **argv)
 {
-#ifndef __WXWINCE__
     DisableAutomaticSETranslator();
-#endif
 
     return wxEntryReal(argc, argv);
 }
@@ -261,6 +262,28 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
                         wxCmdLineArgType WXUNUSED(pCmdLine),
                         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
     wxSetInstance(hInstance);
     wxApp::m_nCmdShow = nCmdShow;
@@ -317,7 +340,7 @@ extern "C"
 // DLL entry point
 
 BOOL WINAPI
-DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
+DllMain(HINSTANCE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
 {
     // Only call wxEntry if the application itself is part of the DLL.
     // If only the wxWidgets library is in the DLL, then the