1. fixed compilation after wxList::compatibility_iterator changes

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 75eb058746619503a5da48bcb90826f684605216..712dc7234796d6488af22fc6b0f4f55f971ec508 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -31,6 +27,7 @@
 #include "wx/event.h"
 #include "wx/app.h"
 #include "wx/cmdline.h"
 #include "wx/event.h"
 #include "wx/app.h"
 #include "wx/cmdline.h"

+#include "wx/scopeguard.h"

 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 


@@ -251,17 +248,118 @@ int wxEntry(int& argc, wxChar **argv)
 
 #endif // wxUSE_BASE
 
 
 #endif // wxUSE_BASE
 

-#if wxUSE_GUI
+#if wxUSE_GUI && defined(__WXMSW__)
+
+#if wxUSE_UNICODE && !defined(__WXWINCE__)
+    #define NEED_UNICODE_CHECK
+#endif
+
+#ifdef NEED_UNICODE_CHECK
+
+// check whether Unicode is available
+static bool wxIsUnicodeAvailable()
+{
+    static const wchar_t *ERROR_STRING = L"wxWidgets Fatal Error";
+
+    if ( wxGetOsVersion() != wxWINDOWS_NT )
+    {
+        // we need to be built with MSLU support
+#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
+        ::MessageBox
+        (
+         NULL,
+         L"This program uses Unicode and requires Windows NT/2000/XP.\n"
+         L"\n"
+         L"Program aborted.",
+         ERROR_STRING,
+         MB_ICONERROR | MB_OK
+        );
+
+        return false;
+#else // wxUSE_UNICODE_MSLU
+        // and the MSLU DLL must also be available
+        HMODULE hmod = ::LoadLibraryA("unicows.dll");
+        if ( !hmod )
+        {
+            ::MessageBox
+            (
+             NULL,
+             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 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
+    }
+
+    return true;
+}
+
+#endif // NEED_UNICODE_CHECK

 
 // ----------------------------------------------------------------------------
 // Windows-specific wxEntry
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // Windows-specific wxEntry
 // ----------------------------------------------------------------------------
 

+// helper function used to clean up in wxEntry() just below
+//
+// notice that argv elements are supposed to be allocated using malloc() while
+// argv array itself is allocated with new
+static void wxFreeArgs(int argc, wxChar **argv)
+{
+    for ( int i = 0; i < argc; i++ )
+    {
+        free(argv[i]);
+    }
+
+    delete [] argv;
+}
+

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


@@ -296,59 +394,12 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
     // argv[] must be NULL-terminated
     argv[argc] = NULL;
 
     // argv[] must be NULL-terminated
     argv[argc] = NULL;
 

-    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.
+    wxON_BLOCK_EXIT2(wxFreeArgs, argc, argv);

 
 

-#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;
+    return wxEntry(argc, argv);

 }
 
 }
 

-#endif // _WINDLL
-
-} // extern "C"
-
-#endif // !NOMAIN
-
-#endif // wxUSE_GUI
+#endif // wxUSE_GUI && __WXMSW__

 
 // ----------------------------------------------------------------------------
 // global HINSTANCE
 
 // ----------------------------------------------------------------------------
 // global HINSTANCE