From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 10 Mar 2008 19:40:21 +0000 (+0000)
Subject: fix handling of native toolkit command line options broken by wxCmdLineArgsArray... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4f6b94a33a3d8779c078740b3eae2090015c838a

fix handling of native toolkit command line options broken by wxCmdLineArgsArray change

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 857b157822..7a6978b255 100644
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -167,16 +167,12 @@ wxAppConsoleBase::~wxAppConsoleBase()
 // initilization/cleanup
 // ----------------------------------------------------------------------------
 
-bool wxAppConsoleBase::Initialize(int& argcOrig, wxChar **argvOrig)
+bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **WXUNUSED(argv))
 {
 #if wxUSE_INTL
     GetTraits()->SetLocale();
 #endif // wxUSE_INTL
 
-    // remember the command line arguments
-    argc = argcOrig;
-    argv = argvOrig;
-
 #if wxUSE_THREADS
     wxPendingEventsLocker = new wxCriticalSection;
 #endif
diff --git a/src/common/init.cpp b/src/common/init.cpp
index adb68c947c..ee3847634f 100644
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -298,6 +298,12 @@ bool wxEntryStart(int& argc, wxChar **argv)
         return false;
     }
 
+    // remember, possibly modified (e.g. due to removal of toolkit-specific
+    // parameters), command line arguments in member variables
+    app->argc = argc;
+    app->argv = argv;
+
+
     wxCallAppCleanup callAppCleanup(app.get());
 
     // for compatibility call the old initialization function too
diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index d16741238b..8a762a4c4d 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -437,6 +437,7 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
         }
 
         argc_ = argcGTK;
+        argv_[argc_] = NULL;
     }
     //else: gtk_init() didn't modify our parameters