do use the font in DoGetTextExtent()

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

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 8e0a07afc1a661e9d6f30b58d03d5fcb4e6a0dbb..ef89ba10616be97e3f1d858a0b029272e6b35085 100644 (file)
--- 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:
 // Purpose:     WinMain/DllMain
 // Author:      Julian Smart
 // Modified by:


@@ -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"
 


@@ -28,19 +24,21 @@
     #pragma hdrstop
 #endif
 
     #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/cmdline.h"

+#include "wx/scopeguard.h"

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

+#include "wx/msw/seh.h"

 
 #if wxUSE_ON_FATAL_EXCEPTION
     #include "wx/datetime.h"
     #include "wx/msw/crashrpt.h"
 
 #if wxUSE_ON_FATAL_EXCEPTION
     #include "wx/datetime.h"
     #include "wx/msw/crashrpt.h"

-
-    #ifdef __VISUALC__
-        #include <eh.h>
-    #endif // __VISUALC__

 #endif // wxUSE_ON_FATAL_EXCEPTION
 
 #ifdef __WXWINCE__
 #endif // wxUSE_ON_FATAL_EXCEPTION
 
 #ifdef __WXWINCE__


@@ -81,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
 
     // 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
 
         #pragma warning(disable:4535)
     #endif
 


@@ -121,16 +119,11 @@ unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs)
         wxGlobalSEInformation = pExcPtrs;
 
         // give the user a chance to do something special about this
         wxGlobalSEInformation = pExcPtrs;
 
         // give the user a chance to do something special about this

-        __try
+        wxSEH_TRY

         {
             wxTheApp->OnFatalException();
         }
         {
             wxTheApp->OnFatalException();
         }

-        __except ( EXCEPTION_EXECUTE_HANDLER )
-        {
-            // nothing to do here, just ignore the exception inside the
-            // exception handler
-            ;
-        }
+        wxSEH_IGNORE      // ignore any exceptions inside the exception handler

 
         wxGlobalSEInformation = NULL;
 
 
         wxGlobalSEInformation = NULL;
 


@@ -143,7 +136,7 @@ unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs)
 
 #ifdef __VISUALC__
 
 
 #ifdef __VISUALC__
 

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

 {
     switch ( wxGlobalSEHandler(ep) )
     {
 {
     switch ( wxGlobalSEHandler(ep) )
     {


@@ -192,7 +185,7 @@ bool wxHandleFatalExceptions(bool doit)
         wxString name = wxString::Format
                         (
                             _T("%s_%s_%lu.dmp"),
         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()
                                      : _T("wxwindows"),
                             wxDateTime::Now().Format(_T("%Y%m%dT%H%M%S")).c_str(),
                             ::GetCurrentProcessId()


@@ -211,20 +204,11 @@ int wxEntry(int& argc, wxChar **argv)
 {
     DisableAutomaticSETranslator();
 
 {
     DisableAutomaticSETranslator();
 

-    __try
+    wxSEH_TRY

     {
         return wxEntryReal(argc, argv);
     }
     {
         return wxEntryReal(argc, argv);
     }

-    __except ( wxGlobalSEHandler(GetExceptionInformation()) )
-    {
-        wxFatalExit();
-
-#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
-    }
+    wxSEH_HANDLE(-1)

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


@@ -253,37 +237,36 @@ int wxEntry(int& argc, wxChar **argv)
 
 #if wxUSE_GUI && defined(__WXMSW__)
 
 
 #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__)
-    if ( wxGetOsVersion() != wxWINDOWS_NT )
+    static const wchar_t *ERROR_STRING = L"wxWidgets Fatal Error";
+
+    if ( wxGetOsVersion() != wxOS_WINDOWS_NT )

     {
         // we need to be built with MSLU support
     {
         // 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
         ::MessageBox
         (
          NULL,
         // 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.\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
         );
 
          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 )
         // and the MSLU DLL must also be available
         HMODULE hmod = ::LoadLibraryA("unicows.dll");
         if ( !hmod )


@@ -291,17 +274,77 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
             ::MessageBox
             (
              NULL,
             ::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
             );
              MB_ICONERROR | MB_OK
             );

-            return -1;
+            return false;

         }
 
         // this is not really necessary but be tidy
         ::FreeLibrary(hmod);
         }
 
         // 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
+// ----------------------------------------------------------------------------
+
+// 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)
+{
+    // 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
 
 
     // remember the parameters Windows gave us


@@ -338,58 +381,11 @@ 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.
-
-#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
+    wxON_BLOCK_EXIT2(wxFreeArgs, argc, argv);

 
 

-    return TRUE;
+    return wxEntry(argc, argv);

 }
 
 }
 

-#endif // _WINDLL
-
-} // extern "C"
-
-#endif // !NOMAIN
-

 #endif // wxUSE_GUI && __WXMSW__
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_GUI && __WXMSW__
 
 // ----------------------------------------------------------------------------


@@ -411,4 +407,3 @@ void wxSetInstance(HINSTANCE hInst)
 }
 
 #endif // wxUSE_BASE
 }
 
 #endif // wxUSE_BASE

-