X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51523f25d712e56f8cb423e0a44322337ecb7b72..e661fcd7704429e7712d2475a6677255e7d40751:/src/os2/frame.cpp

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 2921ea42dc..dbc1e6be98 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)
@@ -1192,12 +1187,12 @@ void wxFrame::PositionToolBar()
     }
 #endif // wxUSE_STATUSBAR
 
-    if ( GetToolBar() )
+    if ( m_frameToolBar )
     {
         int                         nToolbarWidth;
         int                         nToolbarHeight;
 
-        GetToolBar()->GetSize( &nToolbarWidth
+        m_frameToolBar->GetSize( &nToolbarWidth
                               ,&nToolbarHeight
                              );