avoid duplicating wxWindow::HandleCommand() in wxFrame, only handle the commands...

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index d16741238b99ae806f35c5aa54a5cf9352cc19ea..2041a588a7f8576b9b1fe29773ba7e1ec1ed1d6d 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -204,6 +204,11 @@ bool wxApp::DoIdle()
         g_source_remove(m_idleSourceId);
         m_idleSourceId = 0;
     }
+
+    // Pending events can be added asynchronously,
+    // need to keep idle source if any have appeared
+    needMore = needMore || HasPendingEvents();
+
     // if more idle processing requested
     if (needMore)
     {
@@ -359,14 +364,8 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
     }
 #endif // wxUSE_THREADS
 
-    // We should have the wxUSE_WCHAR_T test on the _outside_
-#if wxUSE_WCHAR_T
     // gtk+ 2.0 supports Unicode through UTF-8 strings
     wxConvCurrent = &wxConvUTF8;
-#else // !wxUSE_WCHAR_T
-    if (!wxOKlibc())
-        wxConvCurrent = (wxMBConv*) NULL;
-#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
 
     // decide which conversion to use for the file names
 
@@ -437,6 +436,7 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
         }
 
         argc_ = argcGTK;
+        argv_[argc_] = NULL;
     }
     //else: gtk_init() didn't modify our parameters