X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9379c0d752144826342fa2688a77aa5cccea3d9b..0c75b29e1ed19810546de38b646b5b901be873e2:/src/gtk/frame.cpp?ds=inline diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 08a0d0e713..118148b185 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -18,15 +18,11 @@ #include "wx/statusbr.h" #endif // WX_PRECOMP -#include "wx/gtk/private.h" -#include "wx/gtk/win_gtk.h" +#include -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -static const int wxSTATUS_HEIGHT = 25; -static const int wxPLACE_HOLDER = 0; +#if wxUSE_LIBHILDON + #include +#endif // wxUSE_LIBHILDON // ---------------------------------------------------------------------------- // event tables @@ -38,152 +34,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) // implementation // ============================================================================ -// ---------------------------------------------------------------------------- -// GTK callbacks -// ---------------------------------------------------------------------------- - -#if wxUSE_MENUS_NATIVE - -//----------------------------------------------------------------------------- -// "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->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->GtkUpdateSize(); -} -} - -#endif // wxUSE_MENUS_NATIVE - -#if wxUSE_TOOLBAR -//----------------------------------------------------------------------------- -// "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->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->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 wxWidgets 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) - { - 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 - 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 ); - } -} - // ---------------------------------------------------------------------------- // wxFrame creation // ---------------------------------------------------------------------------- void wxFrame::Init() { - m_menuBarDetached = false; - m_toolBarDetached = false; - m_menuBarHeight = 2; + m_fsSaveFlag = 0; } bool wxFrame::Create( wxWindow *parent, @@ -194,11 +51,7 @@ 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() @@ -215,26 +68,24 @@ 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 && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR != 0))) + 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() && - !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR != 0))) - (*height) -= wxSTATUS_HEIGHT; + if (m_frameStatusBar && m_frameStatusBar->IsShown()) + *height -= m_frameStatusBar->m_height; #endif // wxUSE_STATUSBAR } @@ -242,25 +93,17 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const // tool bar if (m_frameToolBar && m_frameToolBar->IsShown()) { - if (m_toolBarDetached) + GtkRequisition req; + gtk_widget_size_request(m_frameToolBar->m_widget, &req); + if (m_frameToolBar->IsVertical()) { - if (height != NULL) - *height -= wxPLACE_HOLDER; + if (width) + *width -= req.width; } else { - int x, y; - m_frameToolBar->GetSize( &x, &y ); - if ( m_frameToolBar->IsVertical() ) - { - if (width != NULL) - *width -= x; - } - else - { - if (height != NULL) - *height -= y; - } + if (height) + *height -= req.height; } } #endif // wxUSE_TOOLBAR @@ -271,263 +114,120 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const *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 && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR != 0))) + 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() && - !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR != 0))) - 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->IsVertical() ) - { - 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() +// Create an accelerator table consisting of all the accelerators +// from the menubar in the given menus +static wxAcceleratorTable wxCreateAcceleratorTableForMenuBar(wxMenuBar* menuBar) { - // avoid recursions - if (m_resizing) return; - m_resizing = true; + wxList accelEntries; - // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow - wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") ); - - // space occupied by m_frameToolBar and m_frameMenuBar - int client_area_x_offset = 0, - client_area_y_offset = 0; - - /* 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 */ - - 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) + size_t i; + for (i = 0; i < menuBar->GetMenuCount(); i++) { - // TODO - // Rewrite this terrible code to using GtkVBox + wxAddAccelerators(accelEntries, menuBar->GetMenu(i)); + } - // m_mainWidget holds the menubar, the toolbar and the client - // area, which is represented by m_wxwindow. + size_t n = accelEntries.GetCount(); -#if wxUSE_MENUS_NATIVE - if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR != 0))) - { - if (!GTK_WIDGET_VISIBLE(m_frameMenuBar->m_widget)) - gtk_widget_show( m_frameMenuBar->m_widget ); - int xx = m_miniEdge; - int yy = m_miniEdge + m_miniTitle; - int ww = m_width - 2*m_miniEdge; - 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; - 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; - } - else - { - if (m_frameMenuBar) - { - if (GTK_WIDGET_VISIBLE(m_frameMenuBar->m_widget)) - gtk_widget_hide( m_frameMenuBar->m_widget ); - } - } -#endif // wxUSE_MENUS_NATIVE + if (n == 0) + return wxAcceleratorTable(); -#if wxUSE_TOOLBAR - if ((m_frameToolBar) && m_frameToolBar->IsShown() && - (m_frameToolBar->m_widget->parent == m_mainWidget)) - { - int xx = m_miniEdge; - int yy = m_miniEdge + m_miniTitle; -#if wxUSE_MENUS_NATIVE - if (m_frameMenuBar) - { - if (!m_menuBarDetached) - yy += m_menuBarHeight; - else - yy += wxPLACE_HOLDER; - } -#endif // wxUSE_MENUS_NATIVE - - m_frameToolBar->m_x = xx; - m_frameToolBar->m_y = yy; + wxAcceleratorEntry* entries = new wxAcceleratorEntry[n]; - // 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; + for (i = 0; i < accelEntries.GetCount(); i++) + { + wxAcceleratorEntry* entry = (wxAcceleratorEntry*) accelEntries.Item(i)->GetData(); + entries[i] = (*entry); + delete entry; + + } - 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; + wxAcceleratorTable table(n, entries); + delete[] entries; - } - 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; - hh = m_toolBarDetached ? wxPLACE_HOLDER - : m_frameToolBar->m_height; - - client_area_y_offset += hh; - } + return table; +} +#endif // wxUSE_MENUS && wxUSE_ACCEL - 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 ); - } -#endif // wxUSE_TOOLBAR +bool wxFrame::ShowFullScreen(bool show, long style) +{ + if (!wxFrameBase::ShowFullScreen(show, style)) + return false; - 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; - 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 wxUSE_MENUS && wxUSE_ACCEL + if (show && GetMenuBar()) { - // 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. + 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 + m_frameToolBar, +#else + NULL, +#endif #if wxUSE_STATUSBAR - if (m_frameStatusBar && m_frameStatusBar->IsShown() && - !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR != 0))) - { - 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; - if (ww < 0) - ww = 0; - 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 ); - } - else + m_frameStatusBar, +#else + NULL, +#endif + }; + const long fsNoBar[] = { + wxFULLSCREEN_NOMENUBAR, wxFULLSCREEN_NOTOOLBAR, wxFULLSCREEN_NOSTATUSBAR + }; + for (int i = 0; i < 3; i++) { - if (m_frameStatusBar) + if (show) { - if (GTK_WIDGET_VISIBLE(m_frameStatusBar->m_widget)) - gtk_widget_hide( m_frameStatusBar->m_widget ); + if (bar[i] && (style & fsNoBar[i])) + { + if (bar[i]->IsShown()) + bar[i]->Show(false); + else + style &= ~fsNoBar[i]; + } + } + else + { + if (bar[i] && (m_fsSaveFlag & fsNoBar[i])) + bar[i]->Show(true); } } -#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 ); - } -#endif // wxUSE_STATUSBAR + if (show) + m_fsSaveFlag = style; - m_resizing = false; + return true; } void wxFrame::OnInternalIdle() @@ -571,25 +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) - { - g_signal_handlers_disconnect_by_func (m_frameMenuBar->m_widget, - (gpointer) gtk_menu_attached_callback, - this); - - g_signal_handlers_disconnect_by_func (m_frameMenuBar->m_widget, - (gpointer) gtk_menu_detached_callback, - 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 ) @@ -598,135 +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) - { - 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); - } - - 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 ); + // 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); - m_menuBarHeight = req.height; + // 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); - // resize window in OnInternalIdle + // reset size request to allow native sizing to work + gtk_widget_set_size_request(menuBar->m_widget, -1, -1); - GtkUpdateSize(); + gtk_widget_show( m_frameMenuBar->m_widget ); +#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON + } + // make sure next size_allocate causes a wxSizeEvent + m_oldClientWidth = 0; } - #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) -{ - 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::SetStatusBar(wxStatusBar *statbar) { - bool hadStatBar = m_frameStatusBar != NULL; - - wxFrameBase::SetStatusBar(statbar); - - if (hadStatBar && !m_frameStatusBar) - GtkUpdateSize(); -} - -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