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 512287bf440e7d00257801e6f3a3f4e91e6a0dab..577873e340989c39537fe69b98fa125977c5b258 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -61,13 +61,16 @@
     #define HINSTANCE HANDLE
 #endif
 
     #define HINSTANCE HANDLE
 #endif
 

+// defined in common/init.cpp
+extern int wxEntryReal(int& argc, wxChar **argv);
+

 // ============================================================================
 // implementation: various entry points
 // ============================================================================
 
 #if wxUSE_BASE
 
 // ============================================================================
 // implementation: various entry points
 // ============================================================================
 
 #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
     // 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


@@ -90,16 +93,13 @@
 #endif // __VISUALC__/!__VISUALC__
 
 // ----------------------------------------------------------------------------
 #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
 // OnFatalException() if necessary
 #if wxUSE_ON_FATAL_EXCEPTION
 
 // ----------------------------------------------------------------------------
 
 // wrap real wxEntry in a try-except block to be able to call
 // OnFatalException() if necessary
 #if wxUSE_ON_FATAL_EXCEPTION
 

-// defined in common/init.cpp
-extern int wxEntryReal(int& argc, wxChar **argv);
-

 // global pointer to exception information, only valid inside OnFatalException,
 // used by wxStackWalker and wxCrashReport
 extern EXCEPTION_POINTERS *wxGlobalSEInformation = NULL;
 // global pointer to exception information, only valid inside OnFatalException,
 // used by wxStackWalker and wxCrashReport
 extern EXCEPTION_POINTERS *wxGlobalSEInformation = NULL;


@@ -219,13 +219,18 @@ int wxEntry(int& argc, wxChar **argv)
     {
         wxFatalExit();
 
     {
         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;
         return -1;

+#endif // !__VISUALC__ in release build

     }
 }
 
 #else // !wxUSE_ON_FATAL_EXCEPTION
 
     }
 }
 
 #else // !wxUSE_ON_FATAL_EXCEPTION
 

+#if defined(__VISUALC__) && !defined(__WXWINCE__)
+

 static void
 wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS * WXUNUSED(ep))
 {
 static void
 wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS * WXUNUSED(ep))
 {


@@ -233,6 +238,8 @@ wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS * WXUNUSED(ep))
     throw;
 }
 
     throw;
 }
 

+#endif // __VISUALC__
+

 int wxEntry(int& argc, wxChar **argv)
 {
     DisableAutomaticSETranslator();
 int wxEntry(int& argc, wxChar **argv)
 {
     DisableAutomaticSETranslator();


@@ -255,6 +262,28 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
                         wxCmdLineArgType WXUNUSED(pCmdLine),
                         int nCmdShow)
 {
                         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;
     // remember the parameters Windows gave us
     wxSetInstance(hInstance);
     wxApp::m_nCmdShow = nCmdShow;


@@ -311,7 +340,7 @@ extern "C"
 // DLL entry point
 
 BOOL WINAPI
 // 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
 {
     // Only call wxEntry if the application itself is part of the DLL.
     // If only the wxWidgets library is in the DLL, then the