added wxLogError to wxCSConv so that it complains if the encoding is unknown

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

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index ed9240d235103052012711467a2ad7379184bdde..98ae3305e0fd968b6b1689301de329d6cf071f56 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -243,6 +243,18 @@ void wxFrame::DoGetClientSize(
 {
     RECTL                           vRect;
     ::WinQueryWindowRect(GetHwnd(), &vRect);
 {
     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

     if (pX)
         *pX = vRect.xRight - vRect.xLeft;
     if (pY)
     if (pX)
         *pX = vRect.xRight - vRect.xLeft;
     if (pY)


@@ -1180,12 +1192,12 @@ void wxFrame::PositionToolBar()
     }
 #endif // wxUSE_STATUSBAR
 
     }
 #endif // wxUSE_STATUSBAR
 

-    if ( GetToolBar() )
+    if ( m_frameToolBar )

     {
         int                         nToolbarWidth;
         int                         nToolbarHeight;
 
     {
         int                         nToolbarWidth;
         int                         nToolbarHeight;
 

-        GetToolBar()->GetSize( &nToolbarWidth
+        m_frameToolBar->GetSize( &nToolbarWidth

                               ,&nToolbarHeight
                              );
 
                               ,&nToolbarHeight
                              );