Move wxMBConv_cf out of strconv.cpp and into strconv_cf.(cpp|h) by forking the files...

[wxWidgets.git] / src / gtk / app.cpp

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 56b33401b890e2fe38f6df43c1780030d063d45a..ad027a0232fbd48ce2aea050093d39ee838ced60 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -34,6 +34,7 @@
 
 #include "wx/gtk/win_gtk.h"
 #include "wx/gtk/private.h"
+#include "wx/apptrait.h"
 
 #include <gdk/gdkx.h>
 
@@ -345,9 +346,10 @@ GdkVisual *wxApp::GetGdkVisual()
     return visual;
 }
 
-bool wxApp::Initialize(int& argc, wxChar **argv)
+// use unusual names for the parameters to avoid conflict with wxApp::arg[cv]
+bool wxApp::Initialize(int& argc_, wxChar **argv_)
 {
-    if ( !wxAppBase::Initialize(argc, argv) )
+    if ( !wxAppBase::Initialize(argc_, argv_) )
         return false;
 
 #if wxUSE_THREADS
@@ -406,15 +408,15 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 #if wxUSE_UNICODE
     // gtk_init() wants UTF-8, not wchar_t, so convert
     int i;
-    char **argvGTK = new char *[argc + 1];
-    for ( i = 0; i < argc; i++ )
+    char **argvGTK = new char *[argc_ + 1];
+    for ( i = 0; i < argc_; i++ )
     {
-        argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv[i]));
+        argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv_[i]));
     }
 
-    argvGTK[argc] = NULL;
+    argvGTK[argc_] = NULL;
 
-    int argcGTK = argc;
+    int argcGTK = argc_;
 
 #ifdef __WXGPE__
     init_result = true;  // is there a _check() version of this?
@@ -422,19 +424,20 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 #else
     init_result = gtk_init_check( &argcGTK, &argvGTK );
 #endif
+    wxUpdateLocaleIsUtf8();
 
-    if ( argcGTK != argc )
+    if ( argcGTK != argc_ )
     {
         // we have to drop the parameters which were consumed by GTK+
         for ( i = 0; i < argcGTK; i++ )
         {
-            while ( strcmp(wxConvUTF8.cWX2MB(argv[i]), argvGTK[i]) != 0 )
+            while ( strcmp(wxConvUTF8.cWX2MB(argv_[i]), argvGTK[i]) != 0 )
             {
-                memmove(argv + i, argv + i + 1, (argc - i)*sizeof(*argv));
+                memmove(argv_ + i, argv_ + i + 1, (argc_ - i)*sizeof(*argv_));
             }
         }
 
-        argc = argcGTK;
+        argc_ = argcGTK;
     }
     //else: gtk_init() didn't modify our parameters
 
@@ -446,13 +449,50 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     delete [] argvGTK;
 #else // !wxUSE_UNICODE
-    // gtk_init() shouldn't actually change argv itself (just its contents) so
+    // gtk_init() shouldn't actually change argv_ itself (just its contents) so
     // it's ok to pass pointer to it
-    init_result = gtk_init_check( &argc, &argv );
+    init_result = gtk_init_check( &argc_, &argv_ );
 #endif // wxUSE_UNICODE/!wxUSE_UNICODE
 
-    if (!init_result) {
-        wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?"));
+    // update internal arg[cv] as GTK+ may have removed processed options:
+    this->argc = argc_;
+    this->argv = argv_;
+
+    if ( m_traits )
+    {
+        // if there are still GTK+ standard options unparsed in the command
+        // line, it means that they were not syntactically correct and GTK+
+        // already printed a warning on the command line and we should now
+        // exit:
+        wxArrayString opt, desc;
+        m_traits->GetStandardCmdLineOptions(opt, desc);
+
+        for ( int i = 0; i < argc_; i++ )
+        {
+            // leave just the names of the options with values
+            const wxString str = wxString(argv_[i]).BeforeFirst('=');
+
+            for ( size_t j = 0; j < opt.size(); j++ )
+            {
+                // remove the leading spaces from the option string as it does
+                // have them
+                if ( opt[j].Trim(false).BeforeFirst('=') == str )
+                {
+                    // a GTK+ option can be left on the command line only if
+                    // there was an error in (or before, in another standard
+                    // options) it, so abort, just as we do if incorrect
+                    // program option is given
+                    wxLogError(_("Invalid GTK+ command line option, use \"%s --help\""),
+                               argv_[0]);
+                    return false;
+                }
+            }
+        }
+    }
+
+    if ( !init_result )
+    {
+        wxLogError(_("Unable to initialize GTK+, is DISPLAY set properly?"));
         return false;
     }