really define TRACE_CLIPBOARD (fix for the last commit)

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 160deeaba18e190718417c4de09ff7cb886f999e..e60e5ea94cf8d4b277d31e691c5ebd155168fbe8 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/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/memory.h"
     #include "wx/font.h"

-    #include "wx/gdicmn.h"
-    #include "wx/image.h"

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

-#include "wx/module.h"

 #include "wx/thread.h"
 
 #ifdef __WXGPE__
 #include "wx/thread.h"
 
 #ifdef __WXGPE__


@@ -95,7 +89,6 @@ FORCE_LINK(gnome_vfs)
 //-----------------------------------------------------------------------------
 
 bool   g_mainThreadLocked = false;
 //-----------------------------------------------------------------------------
 
 bool   g_mainThreadLocked = false;

-gint   g_pendingTag = 0;

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


@@ -142,7 +135,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     // We need to remove idle callbacks or the loop will
     // never finish.
 
     // 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
 
 #if wxUSE_LOG
     // disable log flushing from here because a call to wxYield() shouldn't


@@ -191,58 +184,39 @@ void wxApp::WakeUpIdle()
 extern "C"
 {
 
 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();
+    wxapp_install_idle_handler();
+    // remove hook
+    return false;
+}

 
 

+// add emission hook for "event" signal, to re-install idle handler when needed
+static inline void wxAddEmissionHook()
+{
+    GType widgetType = GTK_TYPE_WIDGET;
+    // if GtkWidget type is loaded
+    if (g_type_class_peek(widgetType) != NULL)

     {
     {

-#if wxUSE_THREADS
-        wxMutexLocker lock(gs_idleTagsMutex);
-#endif
-        g_pendingTag = 0;
+        guint sig_id = g_signal_lookup("event", widgetType);
+        g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL);

     }
     }

-
-    // Flush the logged messages if any.
-#if wxUSE_LOG
-    wxLog::FlushActive();
-#endif // wxUSE_LOG
-
-    // Release lock again
-    gdk_threads_leave();
-
-    // Return FALSE to indicate that no more idle events are
-    // to be sent (single shot instead of continuous stream)
-    return FALSE;

 }
 
 static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
     if (!wxTheApp)
 }
 
 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() )
 
 #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
 #endif // __WXDEBUG__
 
     // When getting called from GDK's time-out handler


@@ -250,16 +224,6 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     // thread so we must lock it here ourselves.
     gdk_threads_enter();
 
     // 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
     bool moreIdles;
 
     // Send idle event to all who request them as long as


@@ -270,6 +234,19 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     // Release lock again
     gdk_threads_leave();
 
     // Release lock again
     gdk_threads_leave();
 

+    if (!moreIdles)
+    {
+#if wxUSE_THREADS
+        wxMutexLocker lock(gs_idleTagsMutex);
+#endif
+        // Indicate that we are now in idle mode and event handlers
+        // will have to reinstall the idle handler again.
+        g_isIdle = true;
+        wxTheApp->m_idleTag = 0;
+
+        wxAddEmissionHook();
+    }
+

     // Return FALSE if no more idle events are to be sent
     return moreIdles;
 }
     // Return FALSE if no more idle events are to be sent
     return moreIdles;
 }


@@ -367,6 +344,9 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
 
 void wxapp_install_idle_handler()
 {
 
 void wxapp_install_idle_handler()
 {

+    if (wxTheApp == NULL)
+        return;
+

 #if wxUSE_THREADS
     wxMutexLocker lock(gs_idleTagsMutex);
 #endif
 #if wxUSE_THREADS
     wxMutexLocker lock(gs_idleTagsMutex);
 #endif


@@ -385,15 +365,12 @@ void wxapp_install_idle_handler()
 
     g_isIdle = false;
 
 
     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.
     // 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);

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


@@ -634,15 +611,16 @@ void wxApp::OnAssertFailure(const wxChar *file,
 
 #endif // __WXDEBUG__
 
 
 #endif // __WXDEBUG__
 

-void wxApp::RemoveIdleTag()
+void wxApp::RemoveIdleSource()

 {
 #if wxUSE_THREADS
     wxMutexLocker lock(gs_idleTagsMutex);
 #endif
 {
 #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;
         g_isIdle = true;

+        wxAddEmissionHook();

     }
 }
     }
 }