/////////////////////////////////////////////////////////////////////////////
-// Name: frame.cpp
+// Name: src/gtk/frame.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// 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 <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdkx.h>
+#endif // WX_PRECOMP
+#include "wx/gtk/private.h"
#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
// ----------------------------------------------------------------------------
-#ifndef __WXUNIVERSAL__
- IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
// ============================================================================
// implementation
// "child_attached" of menu bar
//-----------------------------------------------------------------------------
-static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrameGTK *win )
+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
//-----------------------------------------------------------------------------
-static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrameGTK *win )
+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;
- win->m_menuBarDetached = TRUE;
+ // Raise the client area area
+ gdk_window_raise( win->m_wxwindow->window );
+
+ win->m_menuBarDetached = true;
win->GtkUpdateSize();
}
+}
#endif // wxUSE_MENUS_NATIVE
// "child_attached" of tool bar
//-----------------------------------------------------------------------------
-static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrameGTK *win )
+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
//-----------------------------------------------------------------------------
-static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrameGTK *win )
+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;
- win->m_toolBarDetached = TRUE;
+ // Raise the client area area
+ gdk_window_raise( win->m_wxwindow->window );
+
+ win->m_toolBarDetached = true;
win->GtkUpdateSize();
}
+}
#endif // wxUSE_TOOLBAR
// ----------------------------------------------------------------------------
-// wxFrameGTK itself
+// wxFrame itself
// ----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-// InsertChild for wxFrameGTK
+// InsertChild for wxFrame
//-----------------------------------------------------------------------------
-/* Callback for wxFrameGTK. This very strange beast has to be used because
+/* 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( wxFrameGTK* parent, wxWindow* child )
+static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
{
wxASSERT( GTK_IS_WIDGET(child->m_widget) );
if (!parent->m_insertInClientArea)
{
- /* these are outside the client area */
- wxFrameGTK* frame = (wxFrameGTK*) parent;
+ // 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_height );
#if wxUSE_TOOLBAR_NATIVE
- /* we connect to these events for recalculating the client area
- space when the toolbar is floating */
+ // We connect to these events for recalculating the client area
+ // space when the toolbar is floating
if (wxIS_KIND_OF(child,wxToolBar))
{
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 (toolBar->m_widget, "child_attached",
+ G_CALLBACK (gtk_toolbar_attached_callback),
+ parent);
+ g_signal_connect (toolBar->m_widget, "child_detached",
+ G_CALLBACK (gtk_toolbar_detached_callback),
+ parent);
}
}
#endif // wxUSE_TOOLBAR
}
else
{
- /* these are inside the client area */
+ // These are inside the client area
gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
GTK_WIDGET(child->m_widget),
child->m_x,
child->m_width,
child->m_height );
}
-
- /* resize on OnInternalIdle */
- parent->GtkUpdateSize();
}
// ----------------------------------------------------------------------------
-// wxFrameGTK creation
+// wxFrame creation
// ----------------------------------------------------------------------------
-void wxFrameGTK::Init()
+void wxFrame::Init()
{
- m_menuBarDetached = FALSE;
- m_toolBarDetached = FALSE;
+ m_menuBarDetached = false;
+ m_toolBarDetached = false;
+ m_menuBarHeight = 2;
}
-bool wxFrameGTK::Create( wxWindow *parent,
+bool wxFrame::Create( wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos,
long style,
const wxString &name )
{
- bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig,
+ bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig,
style, name);
m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame;
+
return rt;
}
-wxFrameGTK::~wxFrameGTK()
+wxFrame::~wxFrame()
{
- m_isBeingDeleted = TRUE;
+ m_isBeingDeleted = true;
DeleteAllBars();
}
// overridden wxWindow methods
// ----------------------------------------------------------------------------
-void wxFrameGTK::DoGetClientSize( int *width, int *height ) const
+void wxFrame::DoGetClientSize( int *width, int *height ) const
{
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
-
+
wxTopLevelWindow::DoGetClientSize( width, height );
if (height)
{
#if wxUSE_MENUS_NATIVE
- /* menu bar */
+ // menu bar
if (m_frameMenuBar)
{
if (!m_menuBarDetached)
- (*height) -= wxMENU_HEIGHT;
+ (*height) -= m_menuBarHeight;
else
(*height) -= wxPLACE_HOLDER;
}
#endif // wxUSE_MENUS_NATIVE
#if wxUSE_STATUSBAR
- /* status bar */
- if (m_frameStatusBar && m_frameStatusBar->IsShown())
+ // status bar
+ if (m_frameStatusBar && m_frameStatusBar->IsShown())
(*height) -= wxSTATUS_HEIGHT;
#endif // wxUSE_STATUSBAR
+ }
#if wxUSE_TOOLBAR
- /* tool bar */
- if (m_frameToolBar && m_frameToolBar->IsShown())
+ // tool bar
+ if (m_frameToolBar && m_frameToolBar->IsShown())
+ {
+ if (m_toolBarDetached)
{
- if (m_toolBarDetached)
- {
+ if (height != NULL)
*height -= wxPLACE_HOLDER;
+ }
+ else
+ {
+ int x, y;
+ m_frameToolBar->GetSize( &x, &y );
+ if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
+ {
+ if (width != NULL)
+ *width -= x;
}
else
{
- int x, y;
- m_frameToolBar->GetSize( &x, &y );
- if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
- {
- *width -= x;
- }
- else
- {
+ if (height != NULL)
*height -= y;
- }
}
}
-#endif // wxUSE_TOOLBAR
}
+#endif // wxUSE_TOOLBAR
+
+ if (width != NULL && *width < 0)
+ *width = 0;
+ if (height != NULL && *height < 0)
+ *height = 0;
}
-void wxFrameGTK::DoSetClientSize( int width, int height )
+void wxFrame::DoSetClientSize( int width, int height )
{
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
#if wxUSE_MENUS_NATIVE
- /* menu bar */
+ // menu bar
if (m_frameMenuBar)
{
if (!m_menuBarDetached)
- height += wxMENU_HEIGHT;
+ height += m_menuBarHeight;
else
height += wxPLACE_HOLDER;
}
#endif // wxUSE_MENUS_NATIVE
#if wxUSE_STATUSBAR
- /* status bar */
+ // status bar
if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT;
#endif
#if wxUSE_TOOLBAR
- /* tool bar */
+ // tool bar
if (m_frameToolBar && m_frameToolBar->IsShown())
{
if (m_toolBarDetached)
wxTopLevelWindow::DoSetClientSize( width, height );
}
-void wxFrameGTK::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 */
+ // avoid recursions
if (m_resizing) return;
- m_resizing = TRUE;
+ m_resizing = true;
- /* this shouldn't happen: wxFrameGTK, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */
+ // 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 */
+ // space occupied by m_frameToolBar and m_frameMenuBar
int client_area_x_offset = 0,
client_area_y_offset = 0;
- /* wxMDIChildFrame derives from wxFrameGTK but it _is_ a wxWindow as it uses
+ /* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses
wxWindow::Create to create it's GTK equivalent. m_mainWidget is only
- set in wxFrameGTK::Create so it is used to check what kind of frame we
+ set in wxFrame::Create so it is used to check what kind of frame we
have here. if m_mainWidget is NULL it is a wxMDIChildFrame and so we
skip the part which handles m_frameMenuBar, m_frameToolBar and (most
importantly) m_mainWidget */
- if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
- if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
- if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
- if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
+ 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;
if (m_mainWidget)
{
- /* set size hints */
+ // set size hints
gint flag = 0; // GDK_HINT_POS;
- if ((m_minWidth != -1) || (m_minHeight != -1)) flag |= GDK_HINT_MIN_SIZE;
- if ((m_maxWidth != -1) || (m_maxHeight != -1)) flag |= GDK_HINT_MAX_SIZE;
+ 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 = m_minWidth;
- geom.min_height = m_minHeight;
- geom.max_width = m_maxWidth;
- geom.max_height = m_maxHeight;
+ 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. */
+ // 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.
#if wxUSE_MENUS_NATIVE
if (m_frameMenuBar)
int xx = m_miniEdge;
int yy = m_miniEdge + m_miniTitle;
int ww = m_width - 2*m_miniEdge;
- int hh = wxMENU_HEIGHT;
+ if (ww < 0)
+ ww = 0;
+ int hh = m_menuBarHeight;
if (m_menuBarDetached) hh = wxPLACE_HOLDER;
m_frameMenuBar->m_x = xx;
m_frameMenuBar->m_y = yy;
if (m_frameMenuBar)
{
if (!m_menuBarDetached)
- yy += wxMENU_HEIGHT;
+ yy += m_menuBarHeight;
else
yy += wxPLACE_HOLDER;
}
m_frameToolBar->m_x = xx;
m_frameToolBar->m_y = yy;
- /* don't change the toolbar's reported height/width */
+ // don't change the toolbar's reported height/width
int ww, hh;
if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
{
ww = m_toolBarDetached ? wxPLACE_HOLDER
: m_frameToolBar->m_width;
hh = m_height - 2*m_miniEdge;
+ if (hh < 0)
+ hh = 0;
client_area_x_offset += ww;
}
+ else if( m_frameToolBar->GetWindowStyle() & wxTB_BOTTOM )
+ {
+ xx = m_miniEdge;
+ yy = GetClientSize().y;
+#if wxUSE_MENUS_NATIVE
+ yy += m_menuBarHeight;
+#endif // wxUSE_MENU_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;
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 );
}
else
{
- /* if there is no m_mainWidget between m_widget and m_wxwindow there
- is no need to set the size or position of m_wxwindow. */
+ // If there is no m_mainWidget between m_widget and m_wxwindow there
+ // is no need to set the size or position of m_wxwindow.
}
#if wxUSE_STATUSBAR
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;
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() );
}
#endif // wxUSE_STATUSBAR
- m_resizing = FALSE;
+ m_resizing = false;
}
-void wxFrameGTK::OnInternalIdle()
+void wxFrame::OnInternalIdle()
{
- wxTopLevelWindow::OnInternalIdle();
+ wxFrameBase::OnInternalIdle();
#if wxUSE_MENUS_NATIVE
if (m_frameMenuBar) m_frameMenuBar->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
}
#if wxUSE_MENUS_NATIVE
-void wxFrameGTK::DetachMenuBar()
+void wxFrame::DetachMenuBar()
{
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
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_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );
gtk_widget_ref( m_frameMenuBar->m_widget );
- gtk_widget_unparent( m_frameMenuBar->m_widget );
+
+ gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );
}
wxFrameBase::DetachMenuBar();
}
-void wxFrameGTK::AttachMenuBar( wxMenuBar *menuBar )
+void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
{
wxFrameBase::AttachMenuBar(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()
+{
+ GtkRequisition req;
+
+ req.width = 2;
+ req.height = 2;
+
+ // this is called after Remove with a NULL m_frameMenuBar
+ if ( m_frameMenuBar )
+ (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_frameMenuBar->m_widget) )->size_request )
+ (m_frameMenuBar->m_widget, &req );
+
+ m_menuBarHeight = req.height;
+
+ // resize window in OnInternalIdle
- /* resize window in OnInternalIdle */
- m_sizeSet = FALSE;
+ GtkUpdateSize();
}
#endif // wxUSE_MENUS_NATIVE
#if wxUSE_TOOLBAR
-wxToolBar* wxFrameGTK::CreateToolBar( long style, wxWindowID id, const wxString& name )
+wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& name )
{
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
- m_insertInClientArea = FALSE;
+ m_insertInClientArea = false;
m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name );
- m_insertInClientArea = TRUE;
+ m_insertInClientArea = true;
- m_sizeSet = FALSE;
+ GtkUpdateSize();
return m_frameToolBar;
}
-void wxFrameGTK::SetToolBar(wxToolBar *toolbar)
+void wxFrame::SetToolBar(wxToolBar *toolbar)
{
+ bool hadTbar = m_frameToolBar != NULL;
+
wxFrameBase::SetToolBar(toolbar);
- if (m_frameToolBar)
+ if ( m_frameToolBar )
{
- /* insert into toolbar area if not already there */
+ // insert into toolbar area if not already there
if ((m_frameToolBar->m_widget->parent) &&
(m_frameToolBar->m_widget->parent != m_mainWidget))
{
GtkUpdateSize();
}
}
+ else // toolbar unset
+ {
+ // still need to update size if it had been there before
+ if ( hadTbar )
+ {
+ GtkUpdateSize();
+ }
+ }
}
#endif // wxUSE_TOOLBAR
#if wxUSE_STATUSBAR
-wxStatusBar* wxFrameGTK::CreateStatusBar(int number,
+wxStatusBar* wxFrame::CreateStatusBar(int number,
long style,
wxWindowID id,
const wxString& name)
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 wxFrameGTK::PositionStatusBar()
+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
-
projects / wxWidgets.git / blobdiff