X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c84ee88f6f015f5c5aa4f00b095191566fee9ab..bedaf53eaf4e2a860b34d4ff5e0b1928ce8fa5c9:/src/os2/frame.cpp

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 98ae3305e0..457b712767 100644
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -243,18 +243,13 @@ void wxFrame::DoGetClientSize(
 {
     RECTL                           vRect;
     ::WinQueryWindowRect(GetHwnd(), &vRect);
-#if wxUSE_STATUSBAR
-    if ( GetStatusBar() && GetStatusBar()->IsShown() )
-    {
-        int                         nStatusX;
-        int                         nStatusY;
 
-        GetStatusBar()->GetClientSize( &nStatusX
-                                      ,&nStatusY
-                                     );
-        vRect.yBottom += nStatusY;
-    }
-#endif // wxUSE_STATUSBAR
+    //
+    // No need to use statusbar code as in WIN32 as the FORMATFRAME
+    // window procedure ensures PM knows about the new frame client
+    // size internally.  A ::WinQueryWindowRect is all that is needed!
+    //
+
     if (pX)
         *pX = vRect.xRight - vRect.xLeft;
     if (pY)
@@ -1114,6 +1109,15 @@ 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