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

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 857b15782262b7d88151830fdf75b248331fc39d..7a6978b2556946dcf75624e3ba8ec4fec35c0905 100644 (file)
--- 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 adb68c947c9f1466c3dab4b37dd6065b4dc95658..ee3847634f00efa2d81bcb31d09d7ec3d8b9f54c 100644 (file)
--- 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 d16741238b99ae806f35c5aa54a5cf9352cc19ea..8a762a4c4de1359ecb193868ff8e3b8e52a70c4d 100644 (file)
--- 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