fixed wxToolBar::DeleteTool and losing the rows number on sys colour change

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 399e734e84ed96bc1b1a7b982d2fd430af7ee2a9..36dedf86274f91f679c2c1f192dc4153b49c3f08 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -1280,12 +1280,22 @@ void wxExit()
 }
 
 // Yield to incoming messages
 }
 
 // Yield to incoming messages

+
+static bool gs_inYield = FALSE;
+

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

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

     // we don't want to process WM_QUIT from here - it should be processed in
     // the main event loop in order to stop it
     MSG msg;
     // we don't want to process WM_QUIT from here - it should be processed in
     // the main event loop in order to stop it
     MSG msg;


@@ -1307,9 +1317,20 @@ bool wxYield()
     // let the logs be flashed again
     wxLog::Resume();
 
     // let the logs be flashed again
     wxLog::Resume();
 

+    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();
+}
+

 bool wxHandleFatalExceptions(bool doit)
 {
 #if wxUSE_ON_FATAL_EXCEPTION
 bool wxHandleFatalExceptions(bool doit)
 {
 #if wxUSE_ON_FATAL_EXCEPTION