fixed typo that caused incorrect if there was only one book

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index e29797d061470572dbe7d4d4f45f64411b7754dd..14935b2780bc3155e927eb2dee26c5e540d67457 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -80,6 +80,8 @@ void wxExit()
 // wxYield
 //-----------------------------------------------------------------------------
 
 // wxYield
 //-----------------------------------------------------------------------------
 

+static bool gs_inYield = FALSE;
+

 bool wxYield()
 {
 #if wxUSE_THREADS
 bool wxYield()
 {
 #if wxUSE_THREADS


@@ -90,14 +92,12 @@ bool wxYield()
     }
 #endif // wxUSE_THREADS
 
     }
 #endif // wxUSE_THREADS
 

-#ifdef __WXDEBUG__
-    static bool s_inYield = FALSE;
-    
-    if (s_inYield)
+#ifdef __WXDEBUG__    
+    if (gs_inYield)

         wxFAIL_MSG( wxT("wxYield called recursively" ) );
         wxFAIL_MSG( wxT("wxYield called recursively" ) );

-    
-    s_inYield = TRUE;

 #endif
 #endif

+    
+    gs_inYield = TRUE;

 
     if (!g_isIdle)
     {
 
     if (!g_isIdle)
     {


@@ -123,13 +123,24 @@ bool wxYield()
     // let the logs be flashed again
     wxLog::Resume();
 
     // let the logs be flashed again
     wxLog::Resume();
 

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

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

+//-----------------------------------------------------------------------------
+// wxYieldIfNeeded
+// Like wxYield, but fails silently if the yield is recursive.
+//-----------------------------------------------------------------------------
+
+bool wxYieldIfNeeded()
+{
+    if (gs_inYield)
+        return FALSE;
+        
+    return wxYield();    
+}
+

 //-----------------------------------------------------------------------------
 // wxWakeUpIdle
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxWakeUpIdle
 //-----------------------------------------------------------------------------