X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e39af974ef7846e26686ae39d74e4696c1fef0c3..fc5d9e38ee002c024be3019e37b63f1a1d88e7c2:/src/gtk/frame.cpp?ds=sidebyside diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index fd6e17f28a..118148b185 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,54 +7,22 @@ // 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" +#endif // WX_PRECOMP -#include -#include "wx/gtk/private.h" +#include -#include -#include - -#include "wx/gtk/win_gtk.h" - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -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; +#if wxUSE_LIBHILDON + #include +#endif // wxUSE_LIBHILDON // ---------------------------------------------------------------------------- // event tables @@ -66,146 +34,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) // implementation // ============================================================================ -// ---------------------------------------------------------------------------- -// GTK callbacks -// ---------------------------------------------------------------------------- - -#if wxUSE_MENUS_NATIVE - -//----------------------------------------------------------------------------- -// "child_attached" of menu bar -//----------------------------------------------------------------------------- - -static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) -{ - if (!win->m_hasVMT) return; - - win->m_menuBarDetached = FALSE; - win->GtkUpdateSize(); -} - -//----------------------------------------------------------------------------- -// "child_detached" of menu bar -//----------------------------------------------------------------------------- - -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->GtkUpdateSize(); -} - -#endif // wxUSE_MENUS_NATIVE - -#if wxUSE_TOOLBAR -//----------------------------------------------------------------------------- -// "child_attached" of tool bar -//----------------------------------------------------------------------------- - -static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win ) -{ - if (!win->m_hasVMT) return; - - win->m_toolBarDetached = FALSE; - win->GtkUpdateSize(); -} - -//----------------------------------------------------------------------------- -// "child_detached" of tool bar -//----------------------------------------------------------------------------- - -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->GtkUpdateSize(); -} -#endif // wxUSE_TOOLBAR - - -// ---------------------------------------------------------------------------- -// wxFrame itself -// ---------------------------------------------------------------------------- - -//----------------------------------------------------------------------------- -// InsertChild for wxFrame -//----------------------------------------------------------------------------- - -/* 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 - * a child in container classes. */ - -static void wxInsertChildInFrame( wxFrame* 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 ); - -#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)) - { - 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 ); - } - } -#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(); -} - // ---------------------------------------------------------------------------- // wxFrame creation // ---------------------------------------------------------------------------- void wxFrame::Init() { - m_menuBarDetached = FALSE; - m_toolBarDetached = FALSE; - m_menuBarHeight = 2; + m_fsSaveFlag = 0; } bool wxFrame::Create( wxWindow *parent, @@ -216,16 +51,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(); } @@ -237,273 +68,166 @@ 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 (m_frameMenuBar && m_frameMenuBar->IsShown()) { - if (!m_menuBarDetached) - (*height) -= m_menuBarHeight; - else - (*height) -= wxPLACE_HOLDER; + GtkRequisition req; + gtk_widget_size_request(m_frameMenuBar->m_widget, &req); + *height -= req.height; } #endif // wxUSE_MENUS_NATIVE #if wxUSE_STATUSBAR // status bar if (m_frameStatusBar && m_frameStatusBar->IsShown()) - (*height) -= wxSTATUS_HEIGHT; + *height -= m_frameStatusBar->m_height; #endif // wxUSE_STATUSBAR + } #if wxUSE_TOOLBAR - // tool bar - if (m_frameToolBar && m_frameToolBar->IsShown()) + // tool bar + if (m_frameToolBar && m_frameToolBar->IsShown()) + { + GtkRequisition req; + gtk_widget_size_request(m_frameToolBar->m_widget, &req); + 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 -= req.width; + } + else + { + if (height) + *height -= req.height; } -#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 ) +#if wxUSE_MENUS && wxUSE_ACCEL +// Helper for wxCreateAcceleratorTableForMenuBar +static void wxAddAccelerators(wxList& accelEntries, wxMenu* menu) { - wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - -#if wxUSE_MENUS_NATIVE - // menu bar - if (m_frameMenuBar) + size_t i; + for (i = 0; i < menu->GetMenuItems().GetCount(); i++) + { + wxMenuItem* item = (wxMenuItem*) menu->GetMenuItems().Item(i)->GetData(); + if (item->GetSubMenu()) { - if (!m_menuBarDetached) - height += m_menuBarHeight; - else - height += wxPLACE_HOLDER; + wxAddAccelerators(accelEntries, item->GetSubMenu()); } -#endif // wxUSE_MENUS_NATIVE - -#if wxUSE_STATUSBAR - // status bar - if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT; -#endif - -#if wxUSE_TOOLBAR - // tool bar - if (m_frameToolBar && m_frameToolBar->IsShown()) + else if (!item->GetItemLabel().IsEmpty()) { - if (m_toolBarDetached) + wxAcceleratorEntry* entry = wxAcceleratorEntry::Create(item->GetItemLabel()); + if (entry) { - height += wxPLACE_HOLDER; - } - else - { - int x, y; - m_frameToolBar->GetSize( &x, &y ); - if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL ) - { - width += x; - } - else - { - height += y; - } + entry->Set(entry->GetFlags(), entry->GetKeyCode(), item->GetId()); + accelEntries.Append((wxObject*) entry); } } -#endif - - wxTopLevelWindow::DoSetClientSize( width, height ); + } } -void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), - int width, int height ) +// Create an accelerator table consisting of all the accelerators +// from the menubar in the given menus +static wxAcceleratorTable wxCreateAcceleratorTableForMenuBar(wxMenuBar* menuBar) { - // due to a bug in gtk, x,y are always 0 - // m_x = x; - // m_y = y; + wxList accelEntries; + + size_t i; + for (i = 0; i < menuBar->GetMenuCount(); i++) + { + wxAddAccelerators(accelEntries, menuBar->GetMenu(i)); + } - // avoid recursions - if (m_resizing) return; - m_resizing = TRUE; + size_t n = accelEntries.GetCount(); - // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow - wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") ); + if (n == 0) + return wxAcceleratorTable(); - m_width = width; - m_height = height; + wxAcceleratorEntry* entries = new wxAcceleratorEntry[n]; - // space occupied by m_frameToolBar and m_frameMenuBar - int client_area_x_offset = 0, - client_area_y_offset = 0; + for (i = 0; i < accelEntries.GetCount(); i++) + { + wxAcceleratorEntry* entry = (wxAcceleratorEntry*) accelEntries.Item(i)->GetData(); + entries[i] = (*entry); + delete entry; + + } - /* 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 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 */ + wxAcceleratorTable table(n, entries); + delete[] entries; - int minWidth = GetMinWidth(), - minHeight = GetMinHeight(), - maxWidth = GetMaxWidth(), - maxHeight = GetMaxHeight(); + return table; +} +#endif // wxUSE_MENUS && wxUSE_ACCEL - 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; +bool wxFrame::ShowFullScreen(bool show, long style) +{ + if (!wxFrameBase::ShowFullScreen(show, style)) + return false; - if (m_mainWidget) +#if wxUSE_MENUS && wxUSE_ACCEL + if (show && GetMenuBar()) { - // 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. - -#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 = m_menuBarHeight; - if (m_menuBarDetached) hh = wxPLACE_HOLDER; - m_frameMenuBar->m_x = xx; - m_frameMenuBar->m_y = yy; - m_frameMenuBar->m_width = ww; - m_frameMenuBar->m_height = hh; - gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), - m_frameMenuBar->m_widget, - xx, yy, ww, hh ); - client_area_y_offset += hh; - } -#endif // wxUSE_MENUS_NATIVE + wxAcceleratorTable table(wxCreateAcceleratorTableForMenuBar(GetMenuBar())); + if (table.IsOk()) + SetAcceleratorTable(table); + } +#endif // wxUSE_MENUS && wxUSE_ACCEL + wxWindow* const bar[] = { +#if wxUSE_MENUS + m_frameMenuBar, +#else + NULL, +#endif #if wxUSE_TOOLBAR - if ((m_frameToolBar) && m_frameToolBar->IsShown() && - (m_frameToolBar->m_widget->parent == m_mainWidget)) + 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) { - int xx = m_miniEdge; - int yy = m_miniEdge + m_miniTitle; -#if wxUSE_MENUS_NATIVE - if (m_frameMenuBar) + if (bar[i] && (style & fsNoBar[i])) { - if (!m_menuBarDetached) - yy += m_menuBarHeight; + if (bar[i]->IsShown()) + bar[i]->Show(false); else - yy += wxPLACE_HOLDER; + style &= ~fsNoBar[i]; } -#endif // wxUSE_MENUS_NATIVE - - m_frameToolBar->m_x = xx; - m_frameToolBar->m_y = yy; - - // 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; - - client_area_x_offset += ww; - } - else - { - ww = m_width - 2*m_miniEdge; - hh = m_toolBarDetached ? wxPLACE_HOLDER - : m_frameToolBar->m_height; - - client_area_y_offset += hh; - } - - gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), - m_frameToolBar->m_widget, - xx, yy, ww, hh ); } -#endif // wxUSE_TOOLBAR - - int client_x = client_area_x_offset + 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; - 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 wxUSE_STATUSBAR - if (m_frameStatusBar && m_frameStatusBar->IsShown()) - { - int xx = 0 + m_miniEdge; - int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset; - int ww = m_width - 2*m_miniEdge; - int hh = wxSTATUS_HEIGHT; - m_frameStatusBar->m_x = xx; - m_frameStatusBar->m_y = yy; - m_frameStatusBar->m_width = ww; - m_frameStatusBar->m_height = hh; - 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; - - // send size event to frame - wxSizeEvent event( wxSize(m_width,m_height), GetId() ); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( event ); - -#if wxUSE_STATUSBAR - // send size event to status bar - if (m_frameStatusBar) - { - wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() ); - event2.SetEventObject( m_frameStatusBar ); - m_frameStatusBar->GetEventHandler()->ProcessEvent( event2 ); + else + { + if (bar[i] && (m_fsSaveFlag & fsNoBar[i])) + bar[i]->Show(true); + } } -#endif // wxUSE_STATUSBAR + if (show) + m_fsSaveFlag = style; - m_resizing = FALSE; + return true; } void wxFrame::OnInternalIdle() @@ -517,7 +241,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 } @@ -534,23 +271,21 @@ void wxFrame::DetachMenuBar() if ( m_frameMenuBar ) { +#if wxUSE_LIBHILDON + hildon_window_set_menu(HILDON_WINDOW(m_widget), NULL); +#else // !wxUSE_LIBHILDON m_frameMenuBar->UnsetInvokingWindow( this ); - 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 ); - - gtk_signal_disconnect_by_func( GTK_OBJECT(m_frameMenuBar->m_widget), - GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this ); - } - gtk_widget_ref( m_frameMenuBar->m_widget ); gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget ); +#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON } wxFrameBase::DetachMenuBar(); + + // make sure next size_allocate causes a wxSizeEvent + m_oldClientWidth = 0; } void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) @@ -559,125 +294,118 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) if (m_frameMenuBar) { +#if wxUSE_LIBHILDON + hildon_window_set_menu(HILDON_WINDOW(m_widget), + GTK_MENU(m_frameMenuBar->m_menubar)); +#else // !wxUSE_LIBHILDON m_frameMenuBar->SetInvokingWindow( this ); m_frameMenuBar->SetParent(this); - gtk_pizza_put( GTK_PIZZA(m_mainWidget), - m_frameMenuBar->m_widget, - m_frameMenuBar->m_x, - m_frameMenuBar->m_y, - m_frameMenuBar->m_width, - m_frameMenuBar->m_height ); - - 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 ); - } - - m_frameMenuBar->Show( TRUE ); - UpdateMenuBarSize(); - } - else - { - m_menuBarHeight = 2; - GtkUpdateSize(); // resize window in OnInternalIdle + // menubar goes into top of vbox (m_mainWidget) + gtk_box_pack_start( + GTK_BOX(m_mainWidget), menuBar->m_widget, false, false, 0); + gtk_box_reorder_child(GTK_BOX(m_mainWidget), menuBar->m_widget, 0); + + // disconnect wxWindowGTK "size_request" handler, + // it interferes with sizing of detached GtkHandleBox + gulong handler_id = g_signal_handler_find( + menuBar->m_widget, + GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA), + g_signal_lookup("size_request", GTK_TYPE_WIDGET), + 0, NULL, NULL, menuBar); + if (handler_id != 0) + g_signal_handler_disconnect(menuBar->m_widget, handler_id); + + // reset size request to allow native sizing to work + gtk_widget_set_size_request(menuBar->m_widget, -1, -1); + + gtk_widget_show( m_frameMenuBar->m_widget ); +#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON } + // make sure next size_allocate causes a wxSizeEvent + m_oldClientWidth = 0; } - -void wxFrame::UpdateMenuBarSize() -{ - wxASSERT_MSG( m_frameMenuBar, _T("Updating non existant menubar?") ); - - GtkRequisition req; - - req.width = 2; - req.height = 2; - - (* 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 - - GtkUpdateSize(); -} - #endif // wxUSE_MENUS_NATIVE #if wxUSE_TOOLBAR -wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& name ) -{ - wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - - m_insertInClientArea = FALSE; - - m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name ); - - m_insertInClientArea = TRUE; - - GtkUpdateSize(); - - return m_frameToolBar; -} - void wxFrame::SetToolBar(wxToolBar *toolbar) { - bool hadTbar = m_frameToolBar != NULL; - - wxFrameBase::SetToolBar(toolbar); - - if ( m_frameToolBar ) + m_frameToolBar = toolbar; + if (toolbar) { - // insert into toolbar area if not already there - if ((m_frameToolBar->m_widget->parent) && - (m_frameToolBar->m_widget->parent != m_mainWidget)) + if (toolbar->IsVertical()) { - GetChildren().DeleteObject( m_frameToolBar ); - - gtk_widget_reparent( m_frameToolBar->m_widget, m_mainWidget ); - GtkUpdateSize(); + // Vertical toolbar and m_wxwindow go into an hbox, inside the + // vbox (m_mainWidget). hbox is created on demand. + GtkWidget* hbox = m_wxwindow->parent; + if (!GTK_IS_HBOX(hbox)) + { + hbox = gtk_hbox_new(false, 0); + gtk_widget_show(hbox); + gtk_container_add(GTK_CONTAINER(m_mainWidget), hbox); + gtk_widget_reparent(m_wxwindow, hbox); + } + gtk_widget_reparent(toolbar->m_widget, hbox); + gtk_box_set_child_packing(GTK_BOX(hbox), + toolbar->m_widget, false, false, 0, GTK_PACK_START); + + int pos = 0; // left + if (toolbar->HasFlag(wxTB_RIGHT)) + pos = 1; // right + gtk_box_reorder_child(GTK_BOX(hbox), toolbar->m_widget, pos); } - } - else // toolbar unset - { - // still need to update size if it had been there before - if ( hadTbar ) + else { - GtkUpdateSize(); + // Horizontal toolbar goes into vbox (m_mainWidget) + gtk_widget_reparent(toolbar->m_widget, m_mainWidget); + gtk_box_set_child_packing(GTK_BOX(m_mainWidget), + toolbar->m_widget, false, false, 0, GTK_PACK_START); + + int pos = 0; // top + if (m_frameMenuBar) + pos = 1; // below menubar + if (toolbar->HasFlag(wxTB_BOTTOM)) + pos += 2; // below client area (m_wxwindow) + gtk_box_reorder_child( + GTK_BOX(m_mainWidget), toolbar->m_widget, pos); } + + // disconnect wxWindowGTK "size_request" handler, + // it interferes with sizing of detached GtkHandleBox + gulong handler_id = g_signal_handler_find( + toolbar->m_widget, + GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA), + g_signal_lookup("size_request", GTK_TYPE_WIDGET), + 0, NULL, NULL, toolbar); + if (handler_id != 0) + g_signal_handler_disconnect(toolbar->m_widget, handler_id); + + // reset size request to allow native sizing to work + gtk_widget_set_size_request(toolbar->m_widget, -1, -1); } + // make sure next size_allocate causes a wxSizeEvent + m_oldClientWidth = 0; } #endif // wxUSE_TOOLBAR #if wxUSE_STATUSBAR -wxStatusBar* wxFrame::CreateStatusBar(int number, - long style, - wxWindowID id, - const wxString& name) +void wxFrame::SetStatusBar(wxStatusBar *statbar) { - wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - - // because it will change when toolbar is added - GtkUpdateSize(); - - return wxFrameBase::CreateStatusBar( number, style, id, name ); -} - -void wxFrame::PositionStatusBar() -{ - if ( !m_frameStatusBar ) - return; - - GtkUpdateSize(); + m_frameStatusBar = statbar; + if (statbar) + { + // statusbar goes into bottom of vbox (m_mainWidget) + gtk_widget_reparent(statbar->m_widget, m_mainWidget); + gtk_box_set_child_packing(GTK_BOX(m_mainWidget), + statbar->m_widget, false, false, 0, GTK_PACK_END); + // make sure next size_allocate on statusbar causes a size event + statbar->m_oldClientWidth = 0; + } + // make sure next size_allocate causes a wxSizeEvent + m_oldClientWidth = 0; } #endif // wxUSE_STATUSBAR -