Some new interfaces in common code requires an updated module definition file.

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

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index a8ccb45bae423137e9558e64e333ba76c72f9d06..40ef90f53a65c063e333dc5ada8aaf323cf736ca 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -301,7 +301,7 @@ bool wxApp::RegisterWindowClasses(
     if (!::WinRegisterClass( vHab
                             ,wxCanvasClassName
                             ,wxWndProc
     if (!::WinRegisterClass( vHab
                             ,wxCanvasClassName
                             ,wxWndProc

-                            ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
+                            ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT | CS_CLIPCHILDREN

                             ,sizeof(ULONG)
                            ))
     {
                             ,sizeof(ULONG)
                            ))
     {


@@ -760,6 +760,12 @@ bool wxApp::ProcessMessage(
     }
 #endif // wxUSE_TOOLTIPS
 
     }
 #endif // wxUSE_TOOLTIPS
 

+    //
+    // We must relay Timer events to wxTimer's processing function
+    //
+    if (pMsg->msg == WM_TIMER)
+        wxTimerProc(NULL, 0, (int)pMsg->mp1, 0);
+

     //
     // For some composite controls (like a combobox), wndThis might be NULL
     // because the subcontrol is not a wxWindow, but only the control itself
     //
     // For some composite controls (like a combobox), wndThis might be NULL
     // because the subcontrol is not a wxWindow, but only the control itself


@@ -956,6 +962,8 @@ void wxExit()
     wxApp::CleanUp();
 } // end of wxExit
 
     wxApp::CleanUp();
 } // end of wxExit
 

+static bool gs_inYield = FALSE;
+

 //
 // Yield to incoming messages
 //
 //
 // Yield to incoming messages
 //


@@ -970,6 +978,8 @@ bool wxYield()
     //
     wxLog::Suspend();
 
     //
     wxLog::Suspend();
 

+    gs_inYield = TRUE;
+

     //
     // We want to go back to the main message loop
     // if we see a WM_QUIT. (?)
     //
     // We want to go back to the main message loop
     // if we see a WM_QUIT. (?)


@@ -992,9 +1002,19 @@ bool wxYield()
     // Let the logs be flashed again
     //
     wxLog::Resume();
     // Let the logs be flashed again
     //
     wxLog::Resume();

+    gs_inYield = FALSE;

     return TRUE;
 } // end of wxYield
 
     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
 wxIcon wxApp::GetStdIcon(
   int                               nWhich
 ) const