re-enabled using std::string for wxStringImpl if wxUSE_STL again

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 29c492c62d43d9da0789d9c7566daab29c48472f..20b72a5865227b92d8273cf8a0c994a8cadd1548 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -232,7 +232,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
 
 #if wxUSE_STATUSBAR
         // status bar
-        if (m_frameStatusBar && m_frameStatusBar->IsShown() && 
+        if (m_frameStatusBar && m_frameStatusBar->IsShown() &&
             !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR) != 0))
             (*height) -= wxSTATUS_HEIGHT;
 #endif // wxUSE_STATUSBAR
@@ -288,7 +288,7 @@ void wxFrame::DoSetClientSize( int width, int height )
 
 #if wxUSE_STATUSBAR
         // status bar
-        if (m_frameStatusBar && m_frameStatusBar->IsShown() && 
+        if (m_frameStatusBar && m_frameStatusBar->IsShown() &&
             !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR) != 0))
             height += wxSTATUS_HEIGHT;
 #endif
@@ -485,7 +485,7 @@ void wxFrame::GtkOnSize()
     {
         if (!GTK_WIDGET_VISIBLE(m_frameStatusBar->m_widget))
             gtk_widget_show( m_frameStatusBar->m_widget );
-            
+
         int xx = 0 + m_miniEdge;
         int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset;
         int ww = m_width - 2*m_miniEdge;