replaced wxYield() call in PopupMenu() by a much safer wxYieldForCommandsOnly() ...

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

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 97a1e94984bf1886a8ffb50181252bbbf78bec81..8da4f9c1a7a5532a56b0dd2d9032c30727f73731 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -314,7 +314,6 @@ wxWindow::~wxWindow()
         {
             if (pFrame->GetLastFocus() == this)
                 pFrame->SetLastFocus((wxWindow*)NULL);
-            break;
         }
     }
     if (m_parent)
@@ -1449,6 +1448,17 @@ void wxWindow::DoMoveWindow(
 , int                               nHeight
 )
 {
+    RECTL                           vRect;
+    HWND                            hParent;
+    wxWindow*                       pParent = GetParent();
+
+    if (pParent)
+        hParent = GetWinHwnd(pParent);
+    else
+        hParent = HWND_DESKTOP;
+    ::WinQueryWindowRect(hParent, &vRect);
+    nY = vRect.yTop - (nY + nHeight);
+
     if ( !::WinSetWindowPos( GetHwnd()
                             ,HWND_TOP
                             ,(LONG)nX