don't use deprecated toolbar API

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index b6e5363c0155b3b7e3b9285dbced55859f67b495..2041a588a7f8576b9b1fe29773ba7e1ec1ed1d6d 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -7,12 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __VMS
-// vms_jackets.h should for proper working be included before anything else
-# include <vms_jackets.h>
-#undef ConnectionNumber
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -26,52 +20,18 @@
     #include "wx/font.h"
 #endif
 
     #include "wx/font.h"
 #endif
 

-#include "wx/file.h"
-#include "wx/filename.h"

 #include "wx/thread.h"
 
 #ifdef __WXGPE__
     #include <gpe/init.h>
 #endif
 
 #include "wx/thread.h"
 
 #ifdef __WXGPE__
     #include <gpe/init.h>
 #endif
 

-#ifdef __WXUNIVERSAL__
-    #include "wx/univ/theme.h"
-    #include "wx/univ/renderer.h"
-#endif
-
-#include <unistd.h>
-
-#ifdef HAVE_POLL
-    #if defined(__VMS)
-        #include <poll.h>
-    #else
-        // bug in the OpenBSD headers: at least in 3.1 there is no extern "C"
-        // in neither poll.h nor sys/poll.h which results in link errors later
-        #ifdef __OPENBSD__
-            extern "C"
-            {
-        #endif
-
-        #include <sys/poll.h>
-
-        #ifdef __OPENBSD__
-            };
-        #endif
-    #endif // platform
-#else // !HAVE_POLL
-    // we implement poll() ourselves using select() which is supposed exist in
-    // all modern Unices
-    #include <sys/types.h>
-    #include <sys/time.h>
-    #include <unistd.h>
-    #ifdef HAVE_SYS_SELECT_H
-        #include <sys/select.h>
-    #endif
-#endif // HAVE_POLL/!HAVE_POLL
-
-#include "wx/unix/private.h"
-#include "wx/gtk/win_gtk.h"

 #include "wx/gtk/private.h"
 #include "wx/gtk/private.h"

+#include "wx/apptrait.h"
+
+#if wxUSE_LIBHILDON
+    #include <hildon-widgets/hildon-program.h>
+#endif // wxUSE_LIBHILDON

 
 #include <gdk/gdkx.h>
 
 
 #include <gdk/gdkx.h>
 


@@ -79,29 +39,17 @@
 // link GnomeVFS
 //-----------------------------------------------------------------------------
 
 // link GnomeVFS
 //-----------------------------------------------------------------------------
 

-#if wxUSE_LIBGNOMEVFS
-#include "wx/html/forcelnk.h"
-FORCE_LINK(gnome_vfs)
+#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS
+    #include "wx/link.h"
+    wxFORCE_LINK_MODULE(gnome_vfs)

 #endif
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 #endif
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 

-bool   g_mainThreadLocked = false;
-

 static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
 
 static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-void wxapp_install_idle_handler();
-
-#if wxUSE_THREADS
-static wxMutex gs_idleTagsMutex;
-#endif
-

 //-----------------------------------------------------------------------------
 // wxYield
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxYield
 //-----------------------------------------------------------------------------


@@ -133,17 +81,13 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     wxIsInsideYield = true;
 
 
     wxIsInsideYield = true;
 

-    // We need to remove idle callbacks or the loop will
-    // never finish.
-    wxTheApp->RemoveIdleTag();
-

 #if wxUSE_LOG
     // disable log flushing from here because a call to wxYield() shouldn't
     // normally result in message boxes popping up &c
     wxLog::Suspend();
 #endif
 
 #if wxUSE_LOG
     // disable log flushing from here because a call to wxYield() shouldn't
     // normally result in message boxes popping up &c
     wxLog::Suspend();
 #endif
 

-    while (gtk_events_pending())
+    while (EventsPending())

         gtk_main_iteration();
 
     // It's necessary to call ProcessIdle() to update the frames sizes which
         gtk_main_iteration();
 
     // It's necessary to call ProcessIdle() to update the frames sizes which


@@ -164,185 +108,117 @@ bool wxApp::Yield(bool onlyIfNeeded)
     return true;
 }
 
     return true;
 }
 

-//-----------------------------------------------------------------------------
-// wxWakeUpIdle
-//-----------------------------------------------------------------------------
-
-// RR/KH: No wxMutexGui calls are needed here according to the GTK faq,
-// http://www.gtk.org/faq/#AEN500 - this caused problems for wxPostEvent.
-
-void wxApp::WakeUpIdle()
-{
-    wxapp_install_idle_handler();
-}
-

 //-----------------------------------------------------------------------------
 // local functions
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // local functions
 //-----------------------------------------------------------------------------
 

-// the callback functions must be extern "C" to comply with GTK+ declarations
-extern "C"
-{
-
-static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
+// One-shot signal emission hook, to install idle handler.
+extern "C" {
+static gboolean
+wx_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data)

 {
 {

-    if (!wxTheApp)
-        return false;
-
-#ifdef __WXDEBUG__
-    // don't generate the idle events while the assert modal dialog is shown,
-    // this completely confuses the apps which don't expect to be reentered
-    // from some safely-looking functions
-    if ( wxTheApp->IsInAssert() )
-        return false;
-#endif // __WXDEBUG__
-
-    // When getting called from GDK's time-out handler
-    // we are no longer within GDK's grab on the GUI
-    // thread so we must lock it here ourselves.
-    gdk_threads_enter();
-
-    // Indicate that we are now in idle mode and event handlers
-    // will have to reinstall the idle handler again.
-    {
-#if wxUSE_THREADS
-        wxMutexLocker lock(gs_idleTagsMutex);
-#endif
-        g_isIdle = true;
-        wxTheApp->m_idleTag = 0;
-    }
-
-    bool moreIdles;
-
-    // Send idle event to all who request them as long as
-    // no events have popped up in the event queue.
-    while ( (moreIdles = wxTheApp->ProcessIdle()) && gtk_events_pending() == 0)
-        ;
-
-    // Release lock again
-    gdk_threads_leave();
-
-    // Return FALSE if no more idle events are to be sent
-    return moreIdles;
+    wxApp* app = wxTheApp;
+    if (app != NULL)
+        app->WakeUpIdle();
+    gulong* hook_id = (gulong*)data;
+    // record that hook is not installed
+    *hook_id = 0;
+    // remove hook
+    return false;
+}

 }
 
 }
 

-#if wxUSE_THREADS
-
-#ifdef HAVE_POLL
-    #define wxPoll poll
-    #define wxPollFd pollfd
-#else // !HAVE_POLL
-
-typedef GPollFD wxPollFd;
-
-int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout)
+// Add signal emission hooks, to re-install idle handler when needed.
+static void wx_add_idle_hooks()

 {
 {

-    // convert timeout from ms to struct timeval (s/us)
-    timeval tv_timeout;
-    tv_timeout.tv_sec = timeout/1000;
-    tv_timeout.tv_usec = (timeout%1000)*1000;
-
-    // remember the highest fd used here
-    int fdMax = -1;
-
-    // and fill the sets for select()
-    fd_set readfds;
-    fd_set writefds;
-    fd_set exceptfds;
-    wxFD_ZERO(&readfds);
-    wxFD_ZERO(&writefds);
-    wxFD_ZERO(&exceptfds);
-
-    unsigned int i;
-    for ( i = 0; i < nfds; i++ )
+    // "event" hook

     {
     {

-        wxASSERT_MSG( ufds[i].fd < wxFD_SETSIZE, _T("fd out of range") );
-
-        if ( ufds[i].events & G_IO_IN )
-            wxFD_SET(ufds[i].fd, &readfds);
-
-        if ( ufds[i].events & G_IO_PRI )
-            wxFD_SET(ufds[i].fd, &exceptfds);
-
-        if ( ufds[i].events & G_IO_OUT )
-            wxFD_SET(ufds[i].fd, &writefds);
-
-        if ( ufds[i].fd > fdMax )
-            fdMax = ufds[i].fd;
+        static gulong hook_id = 0;
+        if (hook_id == 0)
+        {
+            static guint sig_id = 0;
+            if (sig_id == 0)
+                sig_id = g_signal_lookup("event", GTK_TYPE_WIDGET);
+            hook_id = g_signal_add_emission_hook(
+                sig_id, 0, wx_emission_hook, &hook_id, NULL);
+        }

     }
     }

-
-    fdMax++;
-    int res = select(fdMax, &readfds, &writefds, &exceptfds, &tv_timeout);
-
-    // translate the results back
-    for ( i = 0; i < nfds; i++ )
+    // "size_allocate" hook
+    // Needed to match the behavior of the old idle system,
+    // but probably not necessary.

     {
     {

-        ufds[i].revents = 0;
-
-        if ( wxFD_ISSET(ufds[i].fd, &readfds ) )
-            ufds[i].revents |= G_IO_IN;
-
-        if ( wxFD_ISSET(ufds[i].fd, &exceptfds ) )
-            ufds[i].revents |= G_IO_PRI;
-
-        if ( wxFD_ISSET(ufds[i].fd, &writefds ) )
-            ufds[i].revents |= G_IO_OUT;
+        static gulong hook_id = 0;
+        if (hook_id == 0)
+        {
+            static guint sig_id = 0;
+            if (sig_id == 0)
+                sig_id = g_signal_lookup("size_allocate", GTK_TYPE_WIDGET);
+            hook_id = g_signal_add_emission_hook(
+                sig_id, 0, wx_emission_hook, &hook_id, NULL);
+        }

     }
     }

-
-    return res;

 }
 
 }
 

-#endif // HAVE_POLL/!HAVE_POLL
-
-static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
+extern "C" {
+static gboolean wxapp_idle_callback(gpointer)

 {
 {

-    gdk_threads_enter();
-
-    wxMutexGuiLeave();
-    g_mainThreadLocked = true;
-
-    // we rely on the fact that glib GPollFD struct is really just pollfd but
-    // I wonder how wise is this in the long term (VZ)
-    gint res = wxPoll( (wxPollFd *) ufds, nfds, timeout );
-
-    wxMutexGuiEnter();
-    g_mainThreadLocked = false;
-
-    gdk_threads_leave();
-
-    return res;
+    return wxTheApp->DoIdle();
+}

 }
 
 }
 

-#endif // wxUSE_THREADS
-
-} // extern "C"
-
-void wxapp_install_idle_handler()
+bool wxApp::DoIdle()

 {
 {

+    guint id_save;
+    {
+        // Allow another idle source to be added while this one is busy.
+        // Needed if an idle event handler runs a new event loop,
+        // for example by showing a dialog.

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-    wxMutexLocker lock(gs_idleTagsMutex);
+        wxMutexLocker lock(*m_idleMutex);

 #endif
 #endif

+        id_save = m_idleSourceId;
+        m_idleSourceId = 0;
+        wx_add_idle_hooks();
+#ifdef __WXDEBUG__
+        // don't generate the idle events while the assert modal dialog is shown,
+        // this matches the behavior of wxMSW
+        if (m_isInAssert)
+            return false;
+#endif
+    }

 
 

-    // Don't install the handler if it's already installed. This test *MUST*
-    // be done when gs_idleTagsMutex is locked!
-    if (!g_isIdle)
-        return;
-
-    // GD: this assert is raised when using the thread sample (which works)
-    //     so the test is probably not so easy. Can widget callbacks be
-    //     triggered from child threads and, if so, for which widgets?
-    // wxASSERT_MSG( wxThread::IsMain() || gs_WakeUpIdle, wxT("attempt to install idle handler from widget callback in child thread (should be exclusively from wxWakeUpIdle)") );
+    gdk_threads_enter();
+    bool needMore;
+    do {
+        needMore = ProcessIdle();
+    } while (needMore && gtk_events_pending() == 0);
+    gdk_threads_leave();

 
 

-    wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
+#if wxUSE_THREADS
+    wxMutexLocker lock(*m_idleMutex);
+#endif
+    // if a new idle source was added during ProcessIdle
+    if (m_idleSourceId != 0)
+    {
+        // remove it
+        g_source_remove(m_idleSourceId);
+        m_idleSourceId = 0;
+    }

 
 

-    g_isIdle = false;
+    // Pending events can be added asynchronously,
+    // need to keep idle source if any have appeared
+    needMore = needMore || HasPendingEvents();

 
 

-    // This routine gets called by all event handlers
-    // indicating that the idle is over. It may also
-    // get called from other thread for sending events
-    // to the main thread (and processing these in
-    // idle time). Very low priority.
-    wxTheApp->m_idleTag = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL);
+    // if more idle processing requested
+    if (needMore)
+    {
+        // keep this source installed
+        m_idleSourceId = id_save;
+        return true;
+    }
+    // add hooks and remove this source
+    wx_add_idle_hooks();
+    return false;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -365,33 +241,43 @@ GtkWidget* wxGetRootWindow()
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 

-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxAppBase::OnIdle)
-END_EVENT_TABLE()
-

 wxApp::wxApp()
 {
 #ifdef __WXDEBUG__
     m_isInAssert = false;
 #endif // __WXDEBUG__
 wxApp::wxApp()
 {
 #ifdef __WXDEBUG__
     m_isInAssert = false;
 #endif // __WXDEBUG__

-
-    m_idleTag = 0;
-    g_isIdle = true;
-    wxapp_install_idle_handler();
-

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-    g_main_context_set_poll_func( NULL, wxapp_poll_func );
+    m_idleMutex = NULL;

 #endif
 #endif

-
-    // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
-    m_glVisualInfo = (void *) NULL;
-    m_glFBCInfo = (void *) NULL;
+    m_idleSourceId = 0;

 }
 
 wxApp::~wxApp()
 {
 }
 
 wxApp::~wxApp()
 {

-    if (m_idleTag)
-        g_source_remove( m_idleTag );
+}
+
+bool wxApp::SetNativeTheme(const wxString& theme)
+{
+    wxString path;
+    path = gtk_rc_get_theme_dir();
+    path += "/";
+    path += theme.utf8_str();
+    path += "/gtk-2.0/gtkrc";
+
+    if ( wxFileExists(path.utf8_str()) )
+        gtk_rc_add_default_file(path.utf8_str());
+    else if ( wxFileExists(theme.utf8_str()) )
+        gtk_rc_add_default_file(theme.utf8_str());
+    else
+    {
+        wxLogWarning("Theme \"%s\" not available.", theme);
+
+        return false;
+    }
+
+    gtk_rc_reparse_all_for_settings(gtk_settings_get_default(), TRUE);
+
+    return true;

 }
 
 bool wxApp::OnInitGui()
 }
 
 bool wxApp::OnInitGui()


@@ -401,27 +287,50 @@ bool wxApp::OnInitGui()
 
     // if this is a wxGLApp (derived from wxApp), and we've already
     // chosen a specific visual, then derive the GdkVisual from that
 
     // if this is a wxGLApp (derived from wxApp), and we've already
     // chosen a specific visual, then derive the GdkVisual from that

-    if (m_glVisualInfo != NULL)
+    if ( GetXVisualInfo() )

     {
     {

-        // seems gtk_widget_set_default_visual no longer exists?

         GdkVisual* vis = gtk_widget_get_default_visual();
 
         GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );
     }
         GdkVisual* vis = gtk_widget_get_default_visual();
 
         GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );
     }

-
-    // On some machines, the default visual is just 256 colours, so
-    // we make sure we get the best. This can sometimes be wasteful.
-

     else
     else

-    if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual))

     {
     {

-        /* seems gtk_widget_set_default_visual no longer exists? */
-        GdkVisual* vis = gtk_widget_get_default_visual();
+        // On some machines, the default visual is just 256 colours, so
+        // we make sure we get the best. This can sometimes be wasteful.
+        if (m_useBestVisual)
+        {
+            if (m_forceTrueColour)
+            {
+                GdkVisual* visual = gdk_visual_get_best_with_both( 24, GDK_VISUAL_TRUE_COLOR );
+                if (!visual)
+                {
+                    wxLogError(wxT("Unable to initialize TrueColor visual."));
+                    return false;
+                }
+                GdkColormap *colormap = gdk_colormap_new( visual, FALSE );
+                gtk_widget_set_default_colormap( colormap );
+            }
+            else
+            {
+                if (gdk_visual_get_best() != gdk_visual_get_system())
+                {
+                    GdkVisual* visual = gdk_visual_get_best();
+                    GdkColormap *colormap = gdk_colormap_new( visual, FALSE );
+                    gtk_widget_set_default_colormap( colormap );
+                }
+            }
+        }
+    }

 
 

-        GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
-        gtk_widget_set_default_colormap( colormap );
+#if wxUSE_LIBHILDON
+    m_hildonProgram = hildon_program_get_instance();
+    if ( !m_hildonProgram )
+    {
+        wxLogError(_("Unable to initialize Hildon program"));
+        return false;

     }
     }

+#endif // wxUSE_LIBHILDON

 
     return true;
 }
 
     return true;
 }


@@ -430,8 +339,9 @@ GdkVisual *wxApp::GetGdkVisual()
 {
     GdkVisual *visual = NULL;
 
 {
     GdkVisual *visual = NULL;
 

-    if (m_glVisualInfo)
-        visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
+    XVisualInfo *xvi = (XVisualInfo *)GetXVisualInfo();
+    if ( xvi )
+        visual = gdkx_visual_get( xvi->visualid );

     else
         visual = gdk_drawable_get_visual( wxGetRootWindow()->window );
 
     else
         visual = gdk_drawable_get_visual( wxGetRootWindow()->window );
 


@@ -440,25 +350,22 @@ GdkVisual *wxApp::GetGdkVisual()
     return visual;
 }
 
     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_)

 {
 {

-    bool init_result;
+    if ( !wxAppBase::Initialize(argc_, argv_) )
+        return false;

 
 #if wxUSE_THREADS
     if (!g_thread_supported())
 
 #if wxUSE_THREADS
     if (!g_thread_supported())

+    {

         g_thread_init(NULL);
         g_thread_init(NULL);

+        gdk_threads_init();
+    }

 #endif // wxUSE_THREADS
 
 #endif // wxUSE_THREADS
 

-    gtk_set_locale();
-
-    // 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;
     // 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
 
 
     // decide which conversion to use for the file names
 


@@ -466,7 +373,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     //     of the filenames for GTK+ programs, so use it if it is set
     wxString encName(wxGetenv(_T("G_FILENAME_ENCODING")));
     encName = encName.BeforeFirst(_T(','));
     //     of the filenames for GTK+ programs, so use it if it is set
     wxString encName(wxGetenv(_T("G_FILENAME_ENCODING")));
     encName = encName.BeforeFirst(_T(','));

-    if (encName == _T("@locale"))
+    if (encName.CmpNoCase(_T("@locale")) == 0)

         encName.clear();
     encName.MakeUpper();
 #if wxUSE_INTL
         encName.clear();
     encName.MakeUpper();
 #if wxUSE_INTL


@@ -483,22 +390,31 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 #else
     if (encName.empty())
         encName = _T("UTF-8");
 #else
     if (encName.empty())
         encName = _T("UTF-8");

+
+    // if wxUSE_INTL==0 it probably indicates that only "C" locale is supported
+    // by the program anyhow so prevent GTK+ from calling setlocale(LC_ALL, "")
+    // from gtk_init_check() as it does by default
+    gtk_disable_setlocale();
+

 #endif // wxUSE_INTL
     static wxConvBrokenFileNames fileconv(encName);
     wxConvFileName = &fileconv;
 
 #endif // wxUSE_INTL
     static wxConvBrokenFileNames fileconv(encName);
     wxConvFileName = &fileconv;
 

+
+    bool init_result;
+    int i;
+

 #if wxUSE_UNICODE
     // gtk_init() wants UTF-8, not wchar_t, so convert
 #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?
 
 #ifdef __WXGPE__
     init_result = true;  // is there a _check() version of this?


@@ -506,19 +422,21 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 #else
     init_result = gtk_init_check( &argcGTK, &argvGTK );
 #endif
 #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++ )
         {
     {
         // 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);
+                memmove(argv_ + i, argv_ + i + 1, (argc_ - i)*sizeof(*argv_));

             }
         }
 
             }
         }
 

-        argc = argcGTK;
+        argc_ = argcGTK;
+        argv_[argc_] = NULL;

     }
     //else: gtk_init() didn't modify our parameters
 
     }
     //else: gtk_init() didn't modify our parameters
 


@@ -530,40 +448,116 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     delete [] argvGTK;
 #else // !wxUSE_UNICODE
 
     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
     // 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
 
 #endif // wxUSE_UNICODE/!wxUSE_UNICODE
 

-    if (!init_result) {
-        wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?"));
-        return false;
-    }
-
-    // we can not enter threads before gtk_init is done
-    gdk_threads_enter();
+    // update internal arg[cv] as GTK+ may have removed processed options:
+    this->argc = argc_;
+    this->argv = argv_;

 
 

-    if ( !wxAppBase::Initialize(argc, argv) )
+    if ( m_traits )

     {
     {

-        gdk_threads_leave();
+        // 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 ( 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;
     }
 
         return false;
     }
 

+    // we can not enter threads before gtk_init is done
+    gdk_threads_enter();
+

     wxSetDetectableAutoRepeat( true );
 
 #if wxUSE_INTL
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
 
     wxSetDetectableAutoRepeat( true );
 
 #if wxUSE_INTL
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
 

+#if wxUSE_THREADS
+    m_idleMutex = new wxMutex;
+#endif
+    // make sure GtkWidget type is loaded, idle hooks need it
+    g_type_class_ref(GTK_TYPE_WIDGET);
+    WakeUpIdle();
+

     return true;
 }
 
 void wxApp::CleanUp()
 {
     return true;
 }
 
 void wxApp::CleanUp()
 {

+    if (m_idleSourceId != 0)
+        g_source_remove(m_idleSourceId);
+
+    // release reference acquired by Initialize()
+    g_type_class_unref(g_type_class_peek(GTK_TYPE_WIDGET));
+

     gdk_threads_leave();
 
     wxAppBase::CleanUp();
     gdk_threads_leave();
 
     wxAppBase::CleanUp();

+
+    // delete this mutex as late as possible as it's used from WakeUpIdle(), in
+    // particular do it after calling the base class CleanUp() which can result
+    // in it being called
+#if wxUSE_THREADS
+    delete m_idleMutex;
+    m_idleMutex = NULL;
+#endif
+}
+
+void wxApp::WakeUpIdle()
+{
+#if wxUSE_THREADS
+    wxMutexLocker lock(*m_idleMutex);
+#endif
+    if (m_idleSourceId == 0)
+        m_idleSourceId = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL);
+}
+
+// Checking for pending events requires first removing our idle source,
+// otherwise it will cause the check to always return true.
+bool wxApp::EventsPending()
+{
+#if wxUSE_THREADS
+    wxMutexLocker lock(*m_idleMutex);
+#endif
+    if (m_idleSourceId != 0)
+    {
+        g_source_remove(m_idleSourceId);
+        m_idleSourceId = 0;
+        wx_add_idle_hooks();
+    }
+    return gtk_events_pending() != 0;

 }
 
 #ifdef __WXDEBUG__
 }
 
 #ifdef __WXDEBUG__


@@ -574,6 +568,8 @@ void wxApp::OnAssertFailure(const wxChar *file,
                             const wxChar* cond,
                             const wxChar *msg)
 {
                             const wxChar* cond,
                             const wxChar *msg)
 {

+
+    // block wx idle events while assert dialog is showing

     m_isInAssert = true;
 
     wxAppBase::OnAssertFailure(file, line, func, cond, msg);
     m_isInAssert = true;
 
     wxAppBase::OnAssertFailure(file, line, func, cond, msg);


@@ -583,15 +579,14 @@ void wxApp::OnAssertFailure(const wxChar *file,
 
 #endif // __WXDEBUG__
 
 
 #endif // __WXDEBUG__
 

-void wxApp::RemoveIdleTag()
-{

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-    wxMutexLocker lock(gs_idleTagsMutex);
-#endif
-    if (!g_isIdle)
-    {
-        g_source_remove( wxTheApp->m_idleTag );
-        wxTheApp->m_idleTag = 0;
-        g_isIdle = true;
-    }
+void wxGUIAppTraits::MutexGuiEnter()
+{
+    gdk_threads_enter();

 }
 }

+
+void wxGUIAppTraits::MutexGuiLeave()
+{
+    gdk_threads_leave();
+}
+#endif // wxUSE_THREADS