X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/msw/main.cpp

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 190786e1e1..06cc6a4771 100644
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -31,6 +31,7 @@
 #endif //WX_PRECOMP
 
 #include "wx/cmdline.h"
+#include "wx/dynlib.h"
 #include "wx/scopeguard.h"
 
 #include "wx/msw/private.h"
@@ -201,7 +202,10 @@ int wxEntry(int& argc, wxChar **argv)
 
 #endif // wxUSE_BASE
 
-#if wxUSE_GUI && defined(__WXMSW__)
+#if wxUSE_GUI
+
+namespace
+{
 
 #if wxUSE_UNICODE && !defined(__WXWINCE__)
     #define NEED_UNICODE_CHECK
@@ -210,7 +214,7 @@ int wxEntry(int& argc, wxChar **argv)
 #ifdef NEED_UNICODE_CHECK
 
 // check whether Unicode is available
-static bool wxIsUnicodeAvailable()
+bool wxIsUnicodeAvailable()
 {
     static const wchar_t *ERROR_STRING = L"wxWidgets Fatal Error";
 
@@ -281,6 +285,21 @@ static bool wxIsUnicodeAvailable()
 
 #endif // NEED_UNICODE_CHECK
 
+void wxSetProcessDPIAware()
+{
+#if wxUSE_DYNLIB_CLASS
+    typedef BOOL (WINAPI *SetProcessDPIAware_t)(void);
+    wxDynamicLibrary dllUser32(wxT("user32.dll"));
+    SetProcessDPIAware_t pfnSetProcessDPIAware =
+        (SetProcessDPIAware_t)dllUser32.RawGetSymbol(wxT("SetProcessDPIAware"));
+
+    if ( pfnSetProcessDPIAware )
+        pfnSetProcessDPIAware();
+#endif // wxUSE_DYNLIB_CLASS
+}
+
+} //anonymous namespace
+
 // ----------------------------------------------------------------------------
 // Windows-specific wxEntry
 // ----------------------------------------------------------------------------
@@ -297,7 +316,7 @@ struct wxMSWCommandLineArguments
         argv = new wxChar *[argc + 1];
         for ( int i = 0; i < argc; i++ )
         {
-            argv[i] = wxStrdup(args[i].wx_str());
+            argv[i] = wxStrdup(args[i].t_str());
         }
 
         // argv[] must be NULL-terminated
@@ -314,8 +333,7 @@ struct wxMSWCommandLineArguments
             free(argv[i]);
         }
 
-        delete [] argv;
-        argv = NULL;
+        wxDELETEA(argv);
         argc = 0;
     }
 
@@ -340,7 +358,9 @@ wxMSWEntryCommon(HINSTANCE hInstance, int nCmdShow)
 
     // remember the parameters Windows gave us
     wxSetInstance(hInstance);
+#ifdef __WXMSW__
     wxApp::m_nCmdShow = nCmdShow;
+#endif
 
     // parse the command line: we can't use pCmdLine in Unicode build so it is
     // simpler to never use it at all (this also results in a more correct
@@ -381,6 +401,13 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
                         wxCmdLineArgType WXUNUSED(pCmdLine),
                         int nCmdShow)
 {
+    // wxWidgets library doesn't have problems with non-default DPI settings,
+    // so we can mark the app as "DPI aware" for Vista/Win7 (see
+    // http://msdn.microsoft.com/en-us/library/dd464659%28VS.85%29.aspx).
+    // Note that we intentionally do it here and not in wxApp, so that it
+    // doesn't happen if wx code is hosted in another app (e.g. a plugin).
+    wxSetProcessDPIAware();
+
     if ( !wxMSWEntryCommon(hInstance, nCmdShow) )
         return -1;
 
@@ -389,7 +416,7 @@ WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
     return wxEntry(wxArgs.argc, wxArgs.argv);
 }
 
-#endif // wxUSE_GUI && __WXMSW__
+#endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 // global HINSTANCE