fix for a crash in ~wxFontList

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

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index cf75302c7832d741c13623afa382663aef7f4d15..2260c6d2c675d5337e9d3da2ca3512e61fce4559 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -301,7 +301,7 @@ bool wxApp::RegisterWindowClasses(
     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)
                            ))
     {
@@ -764,7 +764,7 @@ bool wxApp::ProcessMessage(
     // We must relay Timer events to wxTimer's processing function
     //
     if (pMsg->msg == WM_TIMER)
-        wxTimerProc(NULL, 0, pMsg->mp1, 0);
+        wxTimerProc(NULL, 0, (int)pMsg->mp1, 0);
 
     //
     // For some composite controls (like a combobox), wndThis might be NULL