Weekly Updates

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

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 52a983498a0940591749a505b324dec09d193847..38cc1963b1bc202eca259167594f13089f0da6af 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -442,17 +442,19 @@ bool wxWindowOS2::Create(
     // Generic OS/2 Windows have no Control Data but other classes
     // that call OS2Create may have some.
     //
-    OS2Create( (PSZ)wxCanvasClassName
-              ,rName.c_str()
-              ,ulCreateFlags
-              ,rPos
-              ,rSize
-              ,NULL         // Control Data
-              ,dwExStyle
-              ,TRUE         // Child
-             );
+    bool                            bRetVal = OS2Create( (PSZ)wxCanvasClassName
+                                                        ,rName.c_str()
+                                                        ,ulCreateFlags
+                                                        ,rPos
+                                                        ,rSize
+                                                        ,NULL         // Control Data
+                                                        ,dwExStyle
+                                                        ,TRUE         // Child
+                                                       );
 
-    return(TRUE);
+    if (bRetVal)
+        ::WinSubclassWindow(m_hWnd, (PFNWP)wxWndProc);
+    return(bRetVal);
 } // end of wxWindowOS2::Create
 
 // ---------------------------------------------------------------------------
@@ -2330,17 +2332,6 @@ bool wxWindowOS2::OS2ProcessMessage(
     pMsg = pMsg; // just shut up the compiler
 #endif // __WXUNIVERSAL__
 
-#if wxUSE_TOOLTIPS
-    if ( m_tooltip )
-    {
-        // relay mouse move events to the tooltip control
-        QMSG*                       pQMsg = (QMSG*)pMsg;
-
-        if (pQMsg->msg == WM_MOUSEMOVE )
-            m_tooltip->RelayEvent(pMsg);
-    }
-#endif // wxUSE_TOOLTIPS
-
     return FALSE;
 } // end of wxWindowOS2::OS2ProcessMessage