applied (slightly modified) wxToggleButton patch from John Norris and Axel Schlueter

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 860d6d6c71fde7721580c66a5eac6d4980d2ab3e..680bbce0f0b1d91ac3bf956ac82573e5ee867897 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -82,25 +82,27 @@ void wxExit()
 
 bool wxYield()
 {
 
 bool wxYield()
 {

-    bool has_idle = (wxTheApp->m_idleTag != 0);
+#ifdef __WXDEBUG__
+    static bool s_inYield = FALSE;
+    
+    if (s_inYield)
+        wxFAIL_MSG( wxT("wxYield called recursively" ) );
+    
+    s_inYield = TRUE;
+#endif

 
 

-    if (has_idle)
+    if (!g_isIdle)

     {
     {

-        /* We need to temporarily remove idle callbacks or the loop will
-           never finish. */
+        // We need to remove idle callbacks or the loop will
+        // never finish.

         gtk_idle_remove( wxTheApp->m_idleTag );
         wxTheApp->m_idleTag = 0;
         gtk_idle_remove( wxTheApp->m_idleTag );
         wxTheApp->m_idleTag = 0;

+        g_isIdle = TRUE;

     }
 
     while (gtk_events_pending())
         gtk_main_iteration();
 
     }
 
     while (gtk_events_pending())
         gtk_main_iteration();
 

-    if (has_idle)
-    {
-        /* re-add idle handler (very low priority) */
-        wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL );
-    }
-

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


@@ -113,6 +115,10 @@ bool wxYield()
     // let the logs be flashed again
     wxLog::Resume();
 
     // let the logs be flashed again
     wxLog::Resume();
 

+#ifdef __WXDEBUG__
+    s_inYield = FALSE;
+#endif
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -176,9 +182,6 @@ 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();
 

-    // Sent idle event to all who request them
-    while (wxTheApp->ProcessIdle()) { }
-

     /* Indicate that we are now in idle mode - even so deeply
        in idle mode that we don't get any idle events anymore.
        this is like wxMSW where an idle event is sent only
     /* Indicate that we are now in idle mode - even so deeply
        in idle mode that we don't get any idle events anymore.
        this is like wxMSW where an idle event is sent only


@@ -187,6 +190,9 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     g_isIdle = TRUE;
     wxTheApp->m_idleTag = 0;
 
     g_isIdle = TRUE;
     wxTheApp->m_idleTag = 0;
 

+    // Sent idle event to all who request them
+    while (wxTheApp->ProcessIdle()) { }
+

     // Release lock again
     gdk_threads_leave();
 
     // Release lock again
     gdk_threads_leave();
 


@@ -199,6 +205,8 @@ void wxapp_install_idle_handler()
 {
     wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
 
 {
     wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
 

+    g_isIdle = FALSE;
+

     if (g_pendingTag == 0)
         g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );
         
     if (g_pendingTag == 0)
         g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );
         


@@ -209,8 +217,6 @@ void wxapp_install_idle_handler()
        idle time). Very low priority. */
 
     wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL );
        idle time). Very low priority. */
 
     wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL );

-
-    g_isIdle = FALSE;

 }
 
 #if wxUSE_THREADS
 }
 
 #if wxUSE_THREADS


@@ -289,7 +295,8 @@ wxApp::wxApp()
     m_topWindow = (wxWindow *) NULL;
     m_exitOnFrameDelete = TRUE;
 
     m_topWindow = (wxWindow *) NULL;
     m_exitOnFrameDelete = TRUE;
 

-    m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL );
+    m_idleTag = 0;
+    wxapp_install_idle_handler();

 
 #if wxUSE_THREADS
     m_wakeUpTimerTag = 0;
 
 #if wxUSE_THREADS
     m_wakeUpTimerTag = 0;