removed extra semicolons added by previous patch (patch 1429906)

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 8e0a07afc1a661e9d6f30b58d03d5fcb4e6a0dbb..35f1ada5fc6a9def1a20378859348cc22f9a8942 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -253,19 +249,17 @@ int wxEntry(int& argc, wxChar **argv)
 
 #if wxUSE_GUI && defined(__WXMSW__)
 
-// ----------------------------------------------------------------------------
-// Windows-specific wxEntry
-// ----------------------------------------------------------------------------
+#if wxUSE_UNICODE && !defined(__WXWINCE__)
+    #define NEED_UNICODE_CHECK
+#endif
 
-WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
-                        HINSTANCE WXUNUSED(hPrevInstance),
-                        wxCmdLineArgType WXUNUSED(pCmdLine),
-                        int nCmdShow)
+#ifdef NEED_UNICODE_CHECK
+
+// check whether Unicode is available
+static bool wxIsUnicodeAvailable()
 {
-    // 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 && !defined(__WXWINCE__)
+    static const wchar_t *ERROR_STRING = L"wxWidgets Fatal Error";
+
     if ( wxGetOsVersion() != wxWINDOWS_NT )
     {
         // we need to be built with MSLU support
@@ -276,14 +270,15 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
         ::MessageBox
         (
          NULL,
-         _T("This program uses Unicode and requires Windows NT/2000/XP.\n\nProgram aborted."),
-         _T("wxWidgets Fatal Error"),
+         L"This program uses Unicode and requires Windows NT/2000/XP.\n"
+         L"\n"
+         L"Program aborted.",
+         ERROR_STRING,
          MB_ICONERROR | MB_OK
         );
 
-        return -1;
-#endif // !wxUSE_UNICODE_MSLU
-
+        return false;
+#else // wxUSE_UNICODE_MSLU
         // and the MSLU DLL must also be available
         HMODULE hmod = ::LoadLibraryA("unicows.dll");
         if ( !hmod )
@@ -291,17 +286,63 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
             ::MessageBox
             (
              NULL,
-             _T("This program uses Unicode and requires unicows.dll to work under current operating system.\n\nPlease install unicows.dll and relaunch the program."),
-             _T("wxWidgets Fatal Error"),
+             L"This program uses Unicode and requires unicows.dll to work "
+             L"under current operating system.\n"
+             L"\n"
+             L"Please install unicows.dll and relaunch the program.",
+             ERROR_STRING,
              MB_ICONERROR | MB_OK
             );
-            return -1;
+            return false;
         }
 
         // this is not really necessary but be tidy
         ::FreeLibrary(hmod);
+
+        // finally do the last check: has unicows.lib initialized correctly?
+        hmod = ::LoadLibraryW(L"unicows.dll");
+        if ( !hmod )
+        {
+            ::MessageBox
+            (
+             NULL,
+             L"This program uses Unicode but is not using unicows.dll\n"
+             L"correctly and so cannot work under current operating system.\n"
+             L"Please contact the program author for an updated version.\n"
+             L"\n"
+             L"Program aborted.",
+             ERROR_STRING,
+             MB_ICONERROR | MB_OK
+            );
+
+            return false;
+        }
+
+        ::FreeLibrary(hmod);
+#endif // !wxUSE_UNICODE_MSLU
     }
-#endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
+
+    return true;
+}
+
+#endif // NEED_UNICODE_CHECK
+
+// ----------------------------------------------------------------------------
+// Windows-specific wxEntry
+// ----------------------------------------------------------------------------
+
+WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
+                        HINSTANCE WXUNUSED(hPrevInstance),
+                        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
+#ifdef NEED_UNICODE_CHECK
+    if ( !wxIsUnicodeAvailable() )
+        return -1;
+#endif // NEED_UNICODE_CHECK
 
 
     // remember the parameters Windows gave us
@@ -341,55 +382,6 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
     return wxEntry(argc, argv);
 }
 
-// May wish not to have a DllMain or WinMain, e.g. if we're programming
-// a Netscape plugin or if we're writing a console application
-#if !defined(NOMAIN)
-
-extern "C"
-{
-
-// ----------------------------------------------------------------------------
-// WinMain
-// ----------------------------------------------------------------------------
-
-// Note that WinMain is also defined in dummy.obj, which is linked to
-// an application that is using the DLL version of wxWidgets.
-
-#if defined(_WINDLL)
-
-// DLL entry point
-
-BOOL WINAPI
-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
-    // initialisation will be called when the application implicitly
-    // calls WinMain.
-#ifndef WXMAKINGDLL
-    switch (fdwReason)
-    {
-        case DLL_PROCESS_ATTACH:
-            return wxEntry(hModule);
-
-        case DLL_PROCESS_DETACH:
-            wxEntryCleanup();
-            break;
-    }
-#else
-    (void)hModule;
-    (void)fdwReason;
-#endif // !WXMAKINGDLL
-
-    return TRUE;
-}
-
-#endif // _WINDLL
-
-} // extern "C"
-
-#endif // !NOMAIN
-
 #endif // wxUSE_GUI && __WXMSW__
 
 // ----------------------------------------------------------------------------