X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94f145095605aa3aafaab289b9d3e1630587f821..c782096417f0fd9de6c6d47b23174233ec6bcf57:/src/gtk/frame.cpp?ds=inline diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 48b191aaa0..68adf5fb90 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: frame.cpp +// Name: src/gtk/frame.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,55 +7,26 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#ifdef __GNUG__ - #pragma implementation "frame.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#include "wx/defs.h" +#include "wx/frame.h" -#include "wx/dialog.h" -#include "wx/control.h" -#include "wx/app.h" -#include "wx/menu.h" -#if wxUSE_TOOLBAR +#ifndef WX_PRECOMP + #include "wx/menu.h" #include "wx/toolbar.h" -#endif -#if wxUSE_STATUSBAR #include "wx/statusbr.h" -#endif -#include "wx/dcclient.h" - -#include -#include "wx/gtk/private.h" - -#include -#include +#endif // WX_PRECOMP +#include #include "wx/gtk/win_gtk.h" // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- -const int wxMENU_HEIGHT = 27; -const int wxSTATUS_HEIGHT = 25; -const int wxPLACE_HOLDER = 0; - -// ---------------------------------------------------------------------------- -// idle system -// ---------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; -extern int g_openDialogs; +static const int wxSTATUS_HEIGHT = 25; +static const int wxPLACE_HOLDER = 0; // ---------------------------------------------------------------------------- // event tables @@ -77,31 +48,32 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) // "child_attached" of menu bar //----------------------------------------------------------------------------- +extern "C" { static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { if (!win->m_hasVMT) return; - win->m_menuBarDetached = FALSE; + win->m_menuBarDetached = false; win->GtkUpdateSize(); } +} //----------------------------------------------------------------------------- // "child_detached" of menu bar //----------------------------------------------------------------------------- +extern "C" { static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { - if (g_isIdle) - wxapp_install_idle_handler(); - if (!win->m_hasVMT) return; // Raise the client area area gdk_window_raise( win->m_wxwindow->window ); - win->m_menuBarDetached = TRUE; + win->m_menuBarDetached = true; win->GtkUpdateSize(); } +} #endif // wxUSE_MENUS_NATIVE @@ -110,31 +82,32 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget * // "child_attached" of tool bar //----------------------------------------------------------------------------- +extern "C" { static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { if (!win->m_hasVMT) return; - win->m_toolBarDetached = FALSE; + win->m_toolBarDetached = false; win->GtkUpdateSize(); } +} //----------------------------------------------------------------------------- // "child_detached" of tool bar //----------------------------------------------------------------------------- +extern "C" { static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) { - if (g_isIdle) - wxapp_install_idle_handler(); - if (!win->m_hasVMT) return; // Raise the client area area gdk_window_raise( win->m_wxwindow->window ); - win->m_toolBarDetached = TRUE; + win->m_toolBarDetached = true; win->GtkUpdateSize(); } +} #endif // wxUSE_TOOLBAR @@ -146,66 +119,56 @@ static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidge // InsertChild for wxFrame //----------------------------------------------------------------------------- +#if wxUSE_TOOLBAR + /* Callback for wxFrame. This very strange beast has to be used because * C++ has no virtual methods in a constructor. We have to emulate a - * virtual function here as wxWindows requires different ways to insert + * virtual function here as wxWidgets requires different ways to insert * a child in container classes. */ -static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child ) +static void wxInsertChildInFrame(wxWindow* parent, wxWindow* child) { wxASSERT( GTK_IS_WIDGET(child->m_widget) ); - if (!parent->m_insertInClientArea) - { - // These are outside the client area - wxFrame* frame = (wxFrame*) parent; - gtk_pizza_put( GTK_PIZZA(frame->m_mainWidget), - GTK_WIDGET(child->m_widget), - child->m_x, - child->m_y, - child->m_width, - child->m_height ); + // These are outside the client area + wxFrame* frame = wx_static_cast(wxFrame*, parent); + gtk_pizza_put( GTK_PIZZA(frame->m_mainWidget), + child->m_widget, + child->m_x, + child->m_y, + child->m_width, + child->m_height ); #if wxUSE_TOOLBAR_NATIVE - // We connect to these events for recalculating the client area - // space when the toolbar is floating - if (wxIS_KIND_OF(child,wxToolBar)) + // We connect to these events for recalculating the client area + // space when the toolbar is floating + if (wxIS_KIND_OF(child,wxToolBar)) + { + if (child->HasFlag(wxTB_DOCKABLE)) { - wxToolBar *toolBar = (wxToolBar*) child; - if (toolBar->GetWindowStyle() & wxTB_DOCKABLE) - { - gtk_signal_connect( GTK_OBJECT(toolBar->m_widget), "child_attached", - GTK_SIGNAL_FUNC(gtk_toolbar_attached_callback), (gpointer)parent ); - - gtk_signal_connect( GTK_OBJECT(toolBar->m_widget), "child_detached", - GTK_SIGNAL_FUNC(gtk_toolbar_detached_callback), (gpointer)parent ); - } + g_signal_connect (child->m_widget, "child_attached", + G_CALLBACK (gtk_toolbar_attached_callback), + parent); + g_signal_connect (child->m_widget, "child_detached", + G_CALLBACK (gtk_toolbar_detached_callback), + parent); } -#endif // wxUSE_TOOLBAR - } - else - { - // These are inside the client area - gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow), - GTK_WIDGET(child->m_widget), - child->m_x, - child->m_y, - child->m_width, - child->m_height ); } - - // Resize on OnInternalIdle - parent->GtkUpdateSize(); +#endif // wxUSE_TOOLBAR_NATIVE } +#endif // wxUSE_TOOLBAR + // ---------------------------------------------------------------------------- // wxFrame creation // ---------------------------------------------------------------------------- void wxFrame::Init() { - m_menuBarDetached = FALSE; - m_toolBarDetached = FALSE; + m_menuBarDetached = false; + m_toolBarDetached = false; + m_menuBarHeight = 2; + m_fsSaveFlag = 0; } bool wxFrame::Create( wxWindow *parent, @@ -216,15 +179,12 @@ bool wxFrame::Create( wxWindow *parent, long style, const wxString &name ) { - bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig, - style, name); - m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame; - return rt; + return wxFrameBase::Create(parent, id, title, pos, sizeOrig, style, name); } wxFrame::~wxFrame() { - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; DeleteAllBars(); } @@ -235,118 +195,108 @@ wxFrame::~wxFrame() void wxFrame::DoGetClientSize( int *width, int *height ) const { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - - wxTopLevelWindow::DoGetClientSize( width, height ); + + wxFrameBase::DoGetClientSize(width, height); if (height) { #if wxUSE_MENUS_NATIVE // menu bar - if (m_frameMenuBar) + if (HasVisibleMenubar() && !m_menuBarDetached) { - if (!m_menuBarDetached) - (*height) -= wxMENU_HEIGHT; - else - (*height) -= wxPLACE_HOLDER; + *height -= m_menuBarHeight; } #endif // wxUSE_MENUS_NATIVE #if wxUSE_STATUSBAR // status bar - if (m_frameStatusBar && m_frameStatusBar->IsShown()) - (*height) -= wxSTATUS_HEIGHT; + if (m_frameStatusBar && GTK_WIDGET_VISIBLE(m_frameStatusBar->m_widget)) + *height -= wxSTATUS_HEIGHT; #endif // wxUSE_STATUSBAR + } #if wxUSE_TOOLBAR - // tool bar - if (m_frameToolBar && m_frameToolBar->IsShown()) + // tool bar + if (m_frameToolBar && + GTK_WIDGET_VISIBLE(m_frameToolBar->m_widget) && !m_toolBarDetached) + { + if (m_frameToolBar->IsVertical()) { - if (m_toolBarDetached) - { - *height -= wxPLACE_HOLDER; - } - else - { - int x, y; - m_frameToolBar->GetSize( &x, &y ); - if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL ) - { - *width -= x; - } - else - { - *height -= y; - } - } + if (width) + *width -= m_frameToolBar->GetSize().x; + } + else + { + if (height) + *height -= m_frameToolBar->GetSize().y; } -#endif // wxUSE_TOOLBAR } +#endif // wxUSE_TOOLBAR + + if (width != NULL && *width < 0) + *width = 0; + if (height != NULL && *height < 0) + *height = 0; } -void wxFrame::DoSetClientSize( int width, int height ) +bool wxFrame::ShowFullScreen(bool show, long style) { - wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - -#if wxUSE_MENUS_NATIVE - // menu bar - if (m_frameMenuBar) - { - if (!m_menuBarDetached) - height += wxMENU_HEIGHT; - else - height += wxPLACE_HOLDER; - } -#endif // wxUSE_MENUS_NATIVE - -#if wxUSE_STATUSBAR - // status bar - if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT; + if (!wxFrameBase::ShowFullScreen(show, style)) + return false; + + wxWindow* const bar[] = { +#if wxUSE_MENUS + m_frameMenuBar, +#else + NULL, #endif - #if wxUSE_TOOLBAR - // tool bar - if (m_frameToolBar && m_frameToolBar->IsShown()) + m_frameToolBar, +#else + NULL, +#endif +#if wxUSE_STATUSBAR + m_frameStatusBar, +#else + NULL, +#endif + }; + const long fsNoBar[] = { + wxFULLSCREEN_NOMENUBAR, wxFULLSCREEN_NOTOOLBAR, wxFULLSCREEN_NOSTATUSBAR + }; + for (int i = 0; i < 3; i++) + { + if (show) { - if (m_toolBarDetached) + if (bar[i] && (style & fsNoBar[i])) { - height += wxPLACE_HOLDER; - } - else - { - int x, y; - m_frameToolBar->GetSize( &x, &y ); - if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL ) - { - width += x; - } + if (bar[i]->IsShown()) + bar[i]->Show(false); else - { - height += y; - } + style &= ~fsNoBar[i]; } } -#endif + else + { + if (bar[i] && (m_fsSaveFlag & fsNoBar[i])) + bar[i]->Show(true); + } + } + if (show) + m_fsSaveFlag = style; - wxTopLevelWindow::DoSetClientSize( width, height ); + return true; } -void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), - int width, int height ) +void wxFrame::GtkOnSize() { - // due to a bug in gtk, x,y are always 0 - // m_x = x; - // m_y = y; - // avoid recursions if (m_resizing) return; - m_resizing = TRUE; + m_resizing = true; // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") ); - m_width = width; - m_height = height; - // space occupied by m_frameToolBar and m_frameMenuBar int client_area_x_offset = 0, client_area_y_offset = 0; @@ -358,54 +308,38 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), skip the part which handles m_frameMenuBar, m_frameToolBar and (most importantly) m_mainWidget */ - int minWidth = GetMinWidth(), - minHeight = GetMinHeight(), - maxWidth = GetMaxWidth(), - maxHeight = GetMaxHeight(); - - if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth; - if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight; - if ((maxWidth != -1) && (m_width > maxWidth)) m_width = maxWidth; - if ((maxHeight != -1) && (m_height > maxHeight)) m_height = maxHeight; + ConstrainSize(); if (m_mainWidget) { - // set size hints - gint flag = 0; // GDK_HINT_POS; - if ((minWidth != -1) || (minHeight != -1)) flag |= GDK_HINT_MIN_SIZE; - if ((maxWidth != -1) || (maxHeight != -1)) flag |= GDK_HINT_MAX_SIZE; - GdkGeometry geom; - geom.min_width = minWidth; - geom.min_height = minHeight; - geom.max_width = maxWidth; - geom.max_height = maxHeight; - gtk_window_set_geometry_hints( GTK_WINDOW(m_widget), - (GtkWidget*) NULL, - &geom, - (GdkWindowHints) flag ); - - // I revert back to wxGTK's original behaviour. m_mainWidget holds - // the menubar, the toolbar and the client area, which is represented - // by m_wxwindow. - // This hurts in the eye, but I don't want to call SetSize() - // because I don't want to call any non-native functions here. + // TODO + // Rewrite this terrible code to using GtkVBox + + // m_mainWidget holds the menubar, the toolbar and the client + // area, which is represented by m_wxwindow. + +#if wxUSE_MENUS_NATIVE + int menubarHeight = 0; +#endif #if wxUSE_MENUS_NATIVE - if (m_frameMenuBar) + if (HasVisibleMenubar()) { int xx = m_miniEdge; int yy = m_miniEdge + m_miniTitle; int ww = m_width - 2*m_miniEdge; - int hh = wxMENU_HEIGHT; - if (m_menuBarDetached) hh = wxPLACE_HOLDER; + if (ww < 0) + ww = 0; + menubarHeight = m_menuBarHeight; + if (m_menuBarDetached) menubarHeight = wxPLACE_HOLDER; m_frameMenuBar->m_x = xx; m_frameMenuBar->m_y = yy; m_frameMenuBar->m_width = ww; - m_frameMenuBar->m_height = hh; + m_frameMenuBar->m_height = menubarHeight; gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), m_frameMenuBar->m_widget, - xx, yy, ww, hh ); - client_area_y_offset += hh; + xx, yy, ww, menubarHeight); + client_area_y_offset += menubarHeight; } #endif // wxUSE_MENUS_NATIVE @@ -414,16 +348,11 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), (m_frameToolBar->m_widget->parent == m_mainWidget)) { int xx = m_miniEdge; - int yy = m_miniEdge + m_miniTitle; + int yy = m_miniEdge + m_miniTitle #if wxUSE_MENUS_NATIVE - if (m_frameMenuBar) - { - if (!m_menuBarDetached) - yy += wxMENU_HEIGHT; - else - yy += wxPLACE_HOLDER; - } -#endif // wxUSE_MENUS_NATIVE + + menubarHeight +#endif + ; m_frameToolBar->m_x = xx; m_frameToolBar->m_y = yy; @@ -438,15 +367,43 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), client_area_x_offset += ww; } + else if( m_frameToolBar->HasFlag(wxTB_RIGHT) ) + { + yy += 2; + ww = m_toolBarDetached ? wxPLACE_HOLDER + : m_frameToolBar->m_width; + xx = GetClientSize().x - 1; + hh = m_height - 2*m_miniEdge; + if( hh < 0 ) + hh = 0; + + } + else if( m_frameToolBar->GetWindowStyle() & wxTB_BOTTOM ) + { + xx = m_miniEdge; + yy = GetClientSize().y; +#if wxUSE_MENUS_NATIVE + yy += m_menuBarHeight; +#endif // wxUSE_MENUS_NATIVE + m_frameToolBar->m_x = xx; + m_frameToolBar->m_y = yy; + ww = m_width - 2*m_miniEdge; + hh = m_toolBarDetached ? wxPLACE_HOLDER + : m_frameToolBar->m_height; + } else { ww = m_width - 2*m_miniEdge; hh = m_toolBarDetached ? wxPLACE_HOLDER : m_frameToolBar->m_height; - + client_area_y_offset += hh; } + if (ww < 0) + ww = 0; + if (hh < 0) + hh = 0; gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), m_frameToolBar->m_widget, xx, yy, ww, hh ); @@ -457,6 +414,10 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int client_y = client_area_y_offset + m_miniEdge + m_miniTitle; int client_w = m_width - client_area_x_offset - 2*m_miniEdge; int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle; + if (client_w < 0) + client_w = 0; + if (client_h < 0) + client_h = 0; gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), m_wxwindow, client_x, client_y, client_w, client_h ); @@ -473,6 +434,8 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int xx = 0 + m_miniEdge; int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset; int ww = m_width - 2*m_miniEdge; + if (ww < 0) + ww = 0; int hh = wxSTATUS_HEIGHT; m_frameStatusBar->m_x = xx; m_frameStatusBar->m_y = yy; @@ -481,11 +444,10 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), gtk_pizza_set_size( GTK_PIZZA(m_wxwindow), m_frameStatusBar->m_widget, xx, yy, ww, hh ); - gtk_widget_draw( m_frameStatusBar->m_widget, (GdkRectangle*) NULL ); } #endif // wxUSE_STATUSBAR - m_sizeSet = TRUE; + m_sizeSet = true; // send size event to frame wxSizeEvent event( wxSize(m_width,m_height), GetId() ); @@ -502,12 +464,12 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), } #endif // wxUSE_STATUSBAR - m_resizing = FALSE; + m_resizing = false; } void wxFrame::OnInternalIdle() { - wxTopLevelWindow::OnInternalIdle(); + wxFrameBase::OnInternalIdle(); #if wxUSE_MENUS_NATIVE if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle(); @@ -516,7 +478,20 @@ void wxFrame::OnInternalIdle() if (m_frameToolBar) m_frameToolBar->OnInternalIdle(); #endif #if wxUSE_STATUSBAR - if (m_frameStatusBar) m_frameStatusBar->OnInternalIdle(); + if (m_frameStatusBar) + { + m_frameStatusBar->OnInternalIdle(); + + // There may be controls in the status bar that + // need to be updated + for ( wxWindowList::compatibility_iterator node = m_frameStatusBar->GetChildren().GetFirst(); + node; + node = node->GetNext() ) + { + wxWindow *child = node->GetData(); + child->OnInternalIdle(); + } + } #endif } @@ -537,11 +512,13 @@ void wxFrame::DetachMenuBar() if (m_frameMenuBar->GetWindowStyle() & wxMB_DOCKABLE) { - gtk_signal_disconnect_by_func( GTK_OBJECT(m_frameMenuBar->m_widget), - GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this ); + g_signal_handlers_disconnect_by_func (m_frameMenuBar->m_widget, + (gpointer) gtk_menu_attached_callback, + this); - gtk_signal_disconnect_by_func( GTK_OBJECT(m_frameMenuBar->m_widget), - GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this ); + g_signal_handlers_disconnect_by_func (m_frameMenuBar->m_widget, + (gpointer) gtk_menu_detached_callback, + this); } gtk_widget_ref( m_frameMenuBar->m_widget ); @@ -570,20 +547,50 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) if (menuBar->GetWindowStyle() & wxMB_DOCKABLE) { - gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_attached", - GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this ); - - gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached", - GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this ); + g_signal_connect (menuBar->m_widget, "child_attached", + G_CALLBACK (gtk_menu_attached_callback), + this); + g_signal_connect (menuBar->m_widget, "child_detached", + G_CALLBACK (gtk_menu_detached_callback), + this); } - m_frameMenuBar->Show( TRUE ); + gtk_widget_show( m_frameMenuBar->m_widget ); + + UpdateMenuBarSize(); + } + else + { + m_menuBarHeight = 2; + GtkUpdateSize(); // resize window in OnInternalIdle + } +} + +void wxFrame::UpdateMenuBarSize() +{ + m_menuBarHeight = 2; + + // this is called after Remove with a NULL m_frameMenuBar + if ( m_frameMenuBar ) + { + GtkRequisition req; + gtk_widget_ensure_style(m_frameMenuBar->m_widget); + // have to call class method directly because + // "size_request" signal is overridden by wx + GTK_WIDGET_GET_CLASS(m_frameMenuBar->m_widget)->size_request( + m_frameMenuBar->m_widget, &req); + + m_menuBarHeight = req.height; } // resize window in OnInternalIdle - m_sizeSet = FALSE; + GtkUpdateSize(); } +bool wxFrame::HasVisibleMenubar() const +{ + return m_frameMenuBar && m_frameMenuBar->IsShown(); +} #endif // wxUSE_MENUS_NATIVE #if wxUSE_TOOLBAR @@ -592,13 +599,12 @@ wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& na { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - m_insertInClientArea = FALSE; - + InsertChildFunction save = m_insertCallback; + m_insertCallback = wxInsertChildInFrame; m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name ); + m_insertCallback = save; - m_insertInClientArea = TRUE; - - m_sizeSet = FALSE; + GtkUpdateSize(); return m_frameToolBar; } @@ -643,17 +649,26 @@ wxStatusBar* wxFrame::CreateStatusBar(int number, wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); // because it will change when toolbar is added - m_sizeSet = FALSE; + GtkUpdateSize(); return wxFrameBase::CreateStatusBar( number, style, id, name ); } +void wxFrame::SetStatusBar(wxStatusBar *statbar) +{ + bool hadStatBar = m_frameStatusBar != NULL; + + wxFrameBase::SetStatusBar(statbar); + + if (hadStatBar && !m_frameStatusBar) + GtkUpdateSize(); +} + void wxFrame::PositionStatusBar() { if ( !m_frameStatusBar ) return; - m_sizeSet = FALSE; + GtkUpdateSize(); } #endif // wxUSE_STATUSBAR -