added common regex

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index d1899f78a65165d5c4444905d590114e2b620bf0..fa1fd15f66d814f5f548ab8b5aa2ecf2f55cd137 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -736,8 +736,18 @@ void wxExit()
 }
 
 // Yield to other processes
 }
 
 // Yield to other processes

+
+static bool gs_inYield = FALSE;
+

 bool wxYield()
 {
 bool wxYield()
 {

+#ifdef __WXDEBUG__    
+    if (gs_inYield)
+        wxFAIL_MSG( wxT("wxYield called recursively" ) );
+#endif
+    
+    gs_inYield = TRUE;
+

     while (wxTheApp && wxTheApp->Pending())
         wxTheApp->Dispatch();
 
     while (wxTheApp && wxTheApp->Pending())
         wxTheApp->Dispatch();
 


@@ -746,9 +756,21 @@ bool wxYield()
     XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
 #endif
 
     XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
 #endif
 

+    gs_inYield = FALSE;
+

     return TRUE;
 }
 
     return TRUE;
 }
 

+// Yield to incoming messages; but fail silently if recursion is detected.
+bool wxYieldIfNeeded()
+{
+    if (gs_inYield)
+        return FALSE;
+        
+    return wxYield();
+}
+
+

 // TODO use XmGetPixmap (?) to get the really standard icons!
 
 #include "wx/generic/info.xpm"
 // TODO use XmGetPixmap (?) to get the really standard icons!
 
 #include "wx/generic/info.xpm"