X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2478fde622a16d25c66690af353dfdc37e7b582..1ce5dd35ebae68444e0faca73f087c63a8314a05:/src/msw/main.cpp?ds=sidebyside

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index f5a6a4b22a..9f96ac237c 100644
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation
 #endif
 
@@ -30,6 +30,7 @@
 
 #include "wx/event.h"
 #include "wx/app.h"
+#include "wx/cmdline.h"
 
 #include "wx/msw/private.h"
 
@@ -48,20 +49,41 @@
     #define HINSTANCE HANDLE
 #endif
 
+#if wxUSE_GUI
+
 // ----------------------------------------------------------------------------
 // function prototypes
 // ----------------------------------------------------------------------------
 
-// from src/msw/app.cpp
-extern void WXDLLEXPORT wxEntryCleanup();
+static wxChar **ConvertToStandardCommandArgs(const wxChar *p, int& argc);
 
 // ============================================================================
 // implementation: various entry points
 // ============================================================================
 
+// ----------------------------------------------------------------------------
+// Windows-specific wxEntry
+// ----------------------------------------------------------------------------
+
+WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
+                        HINSTANCE WXUNUSED(hPrevInstance),
+                        char *pCmdLine,
+                        int nCmdShow)
+{
+    // remember the parameters Windows gave us
+    wxSetInstance(hInstance);
+    wxApp::m_nCmdShow = nCmdShow;
+
+    // parse the command line
+    int argc;
+    wxChar **argv = ConvertToStandardCommandArgs(wxConvertMB2WX(pCmdLine), argc);
+
+    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 wxUSE_GUI && !defined(NOMAIN)
+#if !defined(NOMAIN)
 
 extern "C"
 {
@@ -73,20 +95,7 @@ extern "C"
 // Note that WinMain is also defined in dummy.obj, which is linked to
 // an application that is using the DLL version of wxWindows.
 
-#if !defined(_WINDLL)
-
-int PASCAL WinMain(HINSTANCE hInstance,
-                   HINSTANCE hPrevInstance,
-                   LPSTR lpCmdLine,
-                   int nCmdShow)
-{
-    return wxEntry((WXHINSTANCE) hInstance,
-                   (WXHINSTANCE) hPrevInstance,
-                   lpCmdLine,
-                   nCmdShow);
-}
-
-#else // _WINDLL
+#if defined(_WINDLL)
 
 // DLL entry point
 
@@ -101,13 +110,11 @@ DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
     switch (fdwReason)
     {
         case DLL_PROCESS_ATTACH:
-            return wxEntry((WXHINSTANCE) hModule);
+            return wxEntry(hModule);
 
         case DLL_PROCESS_DETACH:
-           if ( wxTheApp )
-              wxTheApp->OnExit();
-           wxEntryCleanup();
-           break;
+            wxEntryCleanup();
+            break;
     }
 #else
 	(void)hModule;
@@ -117,17 +124,55 @@ DllMain(HANDLE hModule, DWORD fdwReason, LPVOID WXUNUSED(lpReserved))
     return TRUE;
 }
 
-#endif // _WINDLL/!_WINDLL
+#endif // _WINDLL
 
 } // extern "C"
 
 #endif // !NOMAIN
 
+// ---------------------------------------------------------------------------
+// Convert Windows to argc, argv style
+// ---------------------------------------------------------------------------
+
+wxChar **ConvertToStandardCommandArgs(const wxChar *p, int& argc)
+{
+    // break the command line in words
+    wxArrayString args;
+    if ( p )
+    {
+        args = wxCmdLineParser::ConvertStringToArgs(p);
+    }
+
+    // +1 here for the program name
+    argc = args.GetCount() + 1;
+
+    // and +1 here for the terminating NULL
+    wxChar **argv = new wxChar *[argc + 1];
+
+    // as we use wxStrdup below we must allocate the first argument using
+    // malloc(), not new[], as well
+    argv[0] = (wxChar *)malloc(MAX_PATH * sizeof(wxChar));
+    ::GetModuleFileName(wxhInstance, argv[0], MAX_PATH);
+
+    // copy all the other arguments to wxApp::argv[]
+    for ( int i = 1; i < argc; i++ )
+    {
+        argv[i] = wxStrdup(args[i - 1]);
+    }
+
+    // argv[] must be NULL-terminated
+    argv[argc] = NULL;
+
+    return argv;
+}
+
+#endif // wxUSE_GUI
+
 // ----------------------------------------------------------------------------
 // global HINSTANCE
 // ----------------------------------------------------------------------------
 
-#ifdef __WXBASE__
+#if wxUSE_BASE
 
 HINSTANCE wxhInstance = 0;
 
@@ -141,5 +186,5 @@ void wxSetInstance(HINSTANCE hInst)
     wxhInstance = hInst;
 }
 
-#endif // __WXBASE__
+#endif // wxUSE_BASE