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 2921ea42dccf18665eccd7a40fe319f3ea9d88fa..98ae3305e0fd968b6b1689301de329d6cf071f56 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -246,7 +246,7 @@ void wxFrame::DoGetClientSize(
 #if wxUSE_STATUSBAR
     if ( GetStatusBar() && GetStatusBar()->IsShown() )
     {
 #if wxUSE_STATUSBAR
     if ( GetStatusBar() && GetStatusBar()->IsShown() )
     {

-        int                         nStatusX
+        int                         nStatusX;

         int                         nStatusY;
 
         GetStatusBar()->GetClientSize( &nStatusX
         int                         nStatusY;
 
         GetStatusBar()->GetClientSize( &nStatusX


@@ -1192,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
                              );