X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b0ec34b1a083595a606b3eb04f4b64bc69955b8..29149a64916d6fdc53e445adca9ef83bc58fb6c3:/src/os2/frame.cpp?ds=sidebyside

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 457b712767..838197f4d4 100644
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -341,15 +341,9 @@ void wxFrame::DoGetPosition(
     POINTL                          vPoint;
 
     ::WinQueryWindowRect(m_hFrame, &vRect);
-    vPoint.x = vRect.xLeft;
 
-    //
-    // OS/2 is backwards [WIN32 it is vRect.yTop]
-    //
-    vPoint.y = vRect.yBottom;
-
-    *pX = vPoint.x;
-    *pY = vPoint.y;
+    *pX = vRect.xRight - vRect.xLeft;
+    *pY = vRect.yTop - vRect.yBottom;
 } // end of wxFrame::DoGetPosition
 
 // ----------------------------------------------------------------------------
@@ -1109,15 +1103,6 @@ void wxFrame::OnActivate(
     }
 } // end of wxFrame::OnActivate
 
-void wxFrame::RemoveChild(
-  wxWindowBase*                     pChild
-)
-{
-    if (pChild == m_pWinLastFocused)
-        m_pWinLastFocused = NULL;
-    wxFrameBase::RemoveChild(pChild);
-} // end of wxFrame::RemoveChild
-
 // ----------------------------------------------------------------------------
 // wxFrame size management: we exclude the areas taken by menu/status/toolbars
 // from the client area, so the client area is what's really available for the
@@ -1365,6 +1350,7 @@ bool wxFrame::HandleSize(
             // restore all child frames too
             //
             IconizeChildFrames(FALSE);
+            (void)SendIconizeEvent(FALSE);
 
             //
             // fall through
@@ -1379,6 +1365,7 @@ bool wxFrame::HandleSize(
             // Iconize all child frames too
             //
             IconizeChildFrames(TRUE);
+            (void)SendIconizeEvent();
             m_bIconized = TRUE;
             break;
     }