Fixed [ 1556843 ] wxGTK FindFocus returns NULL when a wxListBox is focused

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index c9f6bbc8277df4e7858ebdac3b9c49b9d1bf1acf..8eebbeb35c5bebd03da37c3878e010750dd3a660 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -22,18 +22,12 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
-    #include "wx/dialog.h"
-    #include "wx/settings.h"
-    #include "wx/msgdlg.h"
     #include "wx/memory.h"
     #include "wx/font.h"
-    #include "wx/gdicmn.h"
-    #include "wx/image.h"
 #endif
 
 #include "wx/file.h"
 #include "wx/filename.h"
-#include "wx/module.h"
 #include "wx/thread.h"
 
 #ifdef __WXGPE__
@@ -70,6 +64,9 @@
     #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"
@@ -92,7 +89,6 @@ FORCE_LINK(gnome_vfs)
 //-----------------------------------------------------------------------------
 
 bool   g_mainThreadLocked = false;
-gint   g_pendingTag = 0;
 
 static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
 
@@ -139,7 +135,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     // We need to remove idle callbacks or the loop will
     // never finish.
-    wxTheApp->RemoveIdleTag();
+    RemoveIdleSource();
 
 #if wxUSE_LOG
     // disable log flushing from here because a call to wxYield() shouldn't
@@ -188,58 +184,34 @@ void wxApp::WakeUpIdle()
 extern "C"
 {
 
-static gint wxapp_pending_callback( gpointer WXUNUSED(data) )
+// One-shot emission hook for "event" signal, to install idle handler.
+// This will be called when the "event" signal is issued on any GtkWidget object.
+static gboolean
+event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
 {
-    if (!wxTheApp) return TRUE;
-
-    // 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();
-
-    // Sent idle event to all who request them.
-    wxTheApp->ProcessPendingEvents();
-
-    {
-#if wxUSE_THREADS
-        wxMutexLocker lock(gs_idleTagsMutex);
-#endif
-        g_pendingTag = 0;
-    }
-
-    // Flush the logged messages if any.
-#if wxUSE_LOG
-    wxLog::FlushActive();
-#endif // wxUSE_LOG
-
-    // Release lock again
-    gdk_threads_leave();
+    wxapp_install_idle_handler();
+    // remove hook
+    return false;
+}
 
-    // Return FALSE to indicate that no more idle events are
-    // to be sent (single shot instead of continuous stream)
-    return FALSE;
+static inline void wxAddEmissionHook()
+{
+    // add emission hook for "event" signal, to re-install idle handler when needed
+    guint sig_id = g_signal_lookup("event", GTK_TYPE_WIDGET);
+    g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL);
 }
 
 static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
     if (!wxTheApp)
-        return TRUE;
+        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() )
-    {
-        // But repaint the assertion message if necessary
-        if (wxTopLevelWindows.GetCount() > 0)
-        {
-            wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData();
-            if (win->IsKindOf(CLASSINFO(wxMessageDialog)))
-                win->OnInternalIdle();
-        }
-        return TRUE;
-    }
+        return false;
 #endif // __WXDEBUG__
 
     // When getting called from GDK's time-out handler
@@ -267,6 +239,9 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     // Release lock again
     gdk_threads_leave();
 
+    if (!moreIdles)
+        wxAddEmissionHook();
+
     // Return FALSE if no more idle events are to be sent
     return moreIdles;
 }
@@ -382,15 +357,12 @@ void wxapp_install_idle_handler()
 
     g_isIdle = false;
 
-    if (g_pendingTag == 0)
-        g_pendingTag = g_idle_add_full( 900, wxapp_pending_callback, NULL, NULL );
-
     // 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( 1000, wxapp_idle_callback, NULL, NULL );
+    wxTheApp->m_idleTag = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL);
 }
 
 //-----------------------------------------------------------------------------
@@ -616,26 +588,31 @@ void wxApp::CleanUp()
 
 #ifdef __WXDEBUG__
 
-void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
+void wxApp::OnAssertFailure(const wxChar *file,
+                            int line,
+                            const wxChar* func,
+                            const wxChar* cond,
+                            const wxChar *msg)
 {
     m_isInAssert = true;
 
-    wxAppBase::OnAssert(file, line, cond, msg);
+    wxAppBase::OnAssertFailure(file, line, func, cond, msg);
 
     m_isInAssert = false;
 }
 
 #endif // __WXDEBUG__
 
-void wxApp::RemoveIdleTag()
+void wxApp::RemoveIdleSource()
 {
 #if wxUSE_THREADS
     wxMutexLocker lock(gs_idleTagsMutex);
 #endif
-    if (!g_isIdle)
+    if (m_idleTag != 0)
     {
-        g_source_remove( wxTheApp->m_idleTag );
-        wxTheApp->m_idleTag = 0;
+        g_source_remove(m_idleTag);
+        m_idleTag = 0;
         g_isIdle = true;
+        wxAddEmissionHook();
     }
 }