X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99ba739f6ab3c688ded3e8a4be4d4f9fccf03520..1454d4e6599bbd18086cdf0cf1b06c2b9004fe3a:/src/gtk1/app.cpp

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 5db09e1359..14935b2780 100644
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -80,16 +80,24 @@ void wxExit()
 // wxYield
 //-----------------------------------------------------------------------------
 
+static bool gs_inYield = FALSE;
+
 bool wxYield()
 {
-#ifdef __WXDEBUG__
-    static bool s_inYield = FALSE;
-    
-    if (s_inYield)
+#if wxUSE_THREADS
+    if ( !wxThread::IsMain() )
+    {
+        // can't call gtk_main_iteration() from other threads like this
+        return TRUE;
+    }
+#endif // wxUSE_THREADS
+
+#ifdef __WXDEBUG__    
+    if (gs_inYield)
         wxFAIL_MSG( wxT("wxYield called recursively" ) );
-    
-    s_inYield = TRUE;
 #endif
+    
+    gs_inYield = TRUE;
 
     if (!g_isIdle)
     {
@@ -115,13 +123,24 @@ bool wxYield()
     // let the logs be flashed again
     wxLog::Resume();
 
-#ifdef __WXDEBUG__
-    s_inYield = FALSE;
-#endif
+    gs_inYield = FALSE;
 
     return TRUE;
 }
 
+//-----------------------------------------------------------------------------
+// wxYieldIfNeeded
+// Like wxYield, but fails silently if the yield is recursive.
+//-----------------------------------------------------------------------------
+
+bool wxYieldIfNeeded()
+{
+    if (gs_inYield)
+        return FALSE;
+        
+    return wxYield();    
+}
+
 //-----------------------------------------------------------------------------
 // wxWakeUpIdle
 //-----------------------------------------------------------------------------
@@ -182,9 +201,6 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     // 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
@@ -193,6 +209,9 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     g_isIdle = TRUE;
     wxTheApp->m_idleTag = 0;
 
+    // Sent idle event to all who request them
+    while (wxTheApp->ProcessIdle()) { }
+
     // Release lock again
     gdk_threads_leave();
 
@@ -630,11 +649,14 @@ int wxEntryStart( int argc, char *argv[] )
 
     gtk_set_locale();
 
+    // We should have the wxUSE_WCHAR_T test on the _outside_
+#if wxUSE_WCHAR_T
 #if defined(__WXGTK20__)
     // gtk+ 2.0 supports Unicode through UTF-8 strings
     wxConvCurrent = &wxConvUTF8;
-#elif wxUSE_WCHAR_T
+#else
     if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
+#endif
 #else
     if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
 #endif
@@ -654,7 +676,6 @@ int wxEntryStart( int argc, char *argv[] )
     return 0;
 }
 
-
 int wxEntryInitGui()
 {
     int retValue = 0;