better <HR> tag handling in wxHTML

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

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index f95e76b44bfc01db7b06e733498e0d0166c745df..96d1531b5fc472820697ad4c07f2a51e0c918620 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -332,7 +332,7 @@ bool wxApp::RegisterWindowClasses(
     if (!::WinRegisterClass( vHab
                             ,wxFrameClassName
                             ,wxFrameWndProc
-                            ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT  | CS_CLIPCHILDREN
+                            ,CS_SIZEREDRAW | CS_SYNCPAINT  | CS_CLIPCHILDREN
                             ,sizeof(ULONG)
                            ))
     {
@@ -423,7 +423,7 @@ bool wxApp::RegisterWindowClasses(
     if (!::WinRegisterClass( vHab
                             ,wxCanvasClassName
                             ,wxWndProc
-                            ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT | CS_CLIPCHILDREN
+                            ,CS_SIZEREDRAW | CS_HITTEST | CS_SYNCPAINT | CS_CLIPCHILDREN
                             ,sizeof(ULONG)
                            ))
     {
@@ -1117,13 +1117,23 @@ void wxExit()
     wxApp::CleanUp();
 } // end of wxExit
 
-static bool gs_inYield = FALSE;
-
 //
 // Yield to incoming messages
 //
-bool wxYield()
+bool wxApp::Yield(bool onlyIfNeeded)
 {
+    static bool s_inYield = FALSE;
+
+    if ( s_inYield )
+    {
+        if ( !onlyIfNeeded )
+        {
+            wxFAIL_MSG( _T("wxYield() called recursively") );
+        }
+
+        return FALSE;
+    }
+
     HAB                             vHab = 0;
     QMSG                            vMsg;
 
@@ -1133,7 +1143,7 @@ bool wxYield()
     //
     wxLog::Suspend();
 
-    gs_inYield = TRUE;
+    s_inYield = TRUE;
 
     //
     // We want to go back to the main message loop
@@ -1157,19 +1167,10 @@ bool wxYield()
     // Let the logs be flashed again
     //
     wxLog::Resume();
-    gs_inYield = FALSE;
+    s_inYield = FALSE;
     return TRUE;
 } // end of wxYield
 
-// Yield to incoming messages; but fail silently if recursion is detected.
-bool wxYieldIfNeeded()
-{
-    if (gs_inYield)
-        return FALSE;
-
-    return wxYield();
-}
-
 wxIcon wxApp::GetStdIcon(
   int                               nWhich
 ) const