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 4e89e478d080f2cf1242f123fcb922f1d27df307..ef89ba10616be97e3f1d858a0b029272e6b35085 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -26,9 +26,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/event.h"
 
 #ifndef WX_PRECOMP
     #include "wx/event.h"

+    #include "wx/app.h"
+    #include "wx/utils.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/app.h"

 #include "wx/cmdline.h"
 #include "wx/scopeguard.h"
 
 #include "wx/cmdline.h"
 #include "wx/scopeguard.h"
 


@@ -78,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
 


@@ -184,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()


@@ -247,7 +248,7 @@ static bool wxIsUnicodeAvailable()
 {
     static const wchar_t *ERROR_STRING = L"wxWidgets Fatal Error";
 
 {
     static const wchar_t *ERROR_STRING = L"wxWidgets Fatal Error";
 

-    if ( wxGetOsVersion() != wxWINDOWS_NT )
+    if ( wxGetOsVersion() != wxOS_WINDOWS_NT )

     {
         // we need to be built with MSLU support
 #if !wxUSE_UNICODE_MSLU
     {
         // we need to be built with MSLU support
 #if !wxUSE_UNICODE_MSLU