X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0f76951bc2d09a53d7e035e665fd348403c98f9..dc5d118e65603773263040afdf2c97633869e4ca:/src/gtk/frame.cpp?ds=sidebyside

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 68adf5fb90..915b7a2dd2 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -19,155 +19,30 @@
 #endif // WX_PRECOMP
 
 #include <gtk/gtk.h>
-#include "wx/gtk/win_gtk.h"
+#include "wx/gtk/private/gtk2-compat.h"
 
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
+#if wxUSE_LIBHILDON
+    #include <hildon-widgets/hildon-window.h>
+#endif // wxUSE_LIBHILDON
 
-static const int wxSTATUS_HEIGHT  = 25;
-static const int wxPLACE_HOLDER   = 0;
+#if wxUSE_LIBHILDON2
+    #include <hildon/hildon.h>
+#endif // wxUSE_LIBHILDON2
 
 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------
 
-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 (!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 (!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
-//-----------------------------------------------------------------------------
-
-#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 wxWidgets requires different ways to insert
- * a child in container classes. */
-
-static void wxInsertChildInFrame(wxWindow* parent, wxWindow* child)
-{
-    wxASSERT( GTK_IS_WIDGET(child->m_widget) );
-
-    // 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))
-    {
-        if (child->HasFlag(wxTB_DOCKABLE))
-        {
-            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_NATIVE
-}
-
-#endif // wxUSE_TOOLBAR
-
 // ----------------------------------------------------------------------------
 // wxFrame creation
 // ----------------------------------------------------------------------------
 
 void wxFrame::Init()
 {
-    m_menuBarDetached = false;
-    m_toolBarDetached = false;
-    m_menuBarHeight = 2;
     m_fsSaveFlag = 0;
 }
 
@@ -184,7 +59,8 @@ bool wxFrame::Create( wxWindow *parent,
 
 wxFrame::~wxFrame()
 {
-    m_isBeingDeleted = true;
+    SendDestroyEvent();
+
     DeleteAllBars();
 }
 
@@ -198,37 +74,51 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
 
     wxFrameBase::DoGetClientSize(width, height);
 
+    if (m_useCachedClientSize)
+        return;
+
     if (height)
     {
 #if wxUSE_MENUS_NATIVE
         // menu bar
-        if (HasVisibleMenubar() && !m_menuBarDetached)
+        if (m_frameMenuBar && m_frameMenuBar->IsShown())
         {
-            *height -= m_menuBarHeight;
+            int h;
+            gtk_widget_get_preferred_height(m_frameMenuBar->m_widget, NULL, &h);
+#if !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
+            *height -= h;
+#endif
         }
 #endif // wxUSE_MENUS_NATIVE
 
 #if wxUSE_STATUSBAR
         // status bar
-        if (m_frameStatusBar && GTK_WIDGET_VISIBLE(m_frameStatusBar->m_widget))
-            *height -= wxSTATUS_HEIGHT;
+        if (m_frameStatusBar && m_frameStatusBar->IsShown())
+            *height -= m_frameStatusBar->m_height;
 #endif // wxUSE_STATUSBAR
     }
 
 #if wxUSE_TOOLBAR
     // tool bar
-    if (m_frameToolBar &&
-        GTK_WIDGET_VISIBLE(m_frameToolBar->m_widget) && !m_toolBarDetached)
+    if (m_frameToolBar && m_frameToolBar->IsShown())
     {
         if (m_frameToolBar->IsVertical())
         {
             if (width)
-                *width -= m_frameToolBar->GetSize().x;
+            {
+                int w;
+                gtk_widget_get_preferred_width(m_frameToolBar->m_widget, NULL, &w);
+                *width -= w;
+            }
         }
         else
         {
             if (height)
-                *height -= m_frameToolBar->GetSize().y;
+            {
+                int h;
+                gtk_widget_get_preferred_height(m_frameToolBar->m_widget, NULL, &h);
+                *height -= h;
+            }
         }
     }
 #endif // wxUSE_TOOLBAR
@@ -239,11 +129,78 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
         *height = 0;
 }
 
+#if wxUSE_MENUS && wxUSE_ACCEL
+// Helper for wxCreateAcceleratorTableForMenuBar
+static void wxAddAccelerators(wxList& accelEntries, wxMenu* menu)
+{
+    size_t i;
+    for (i = 0; i < menu->GetMenuItems().GetCount(); i++)
+    {
+        wxMenuItem* item = (wxMenuItem*) menu->GetMenuItems().Item(i)->GetData();
+        if (item->GetSubMenu())
+        {
+            wxAddAccelerators(accelEntries, item->GetSubMenu());
+        }
+        else if (!item->GetItemLabel().IsEmpty())
+        {
+            wxAcceleratorEntry* entry = wxAcceleratorEntry::Create(item->GetItemLabel());
+            if (entry)
+            {
+                entry->Set(entry->GetFlags(), entry->GetKeyCode(), item->GetId());
+                accelEntries.Append((wxObject*) entry);
+            }
+        }
+    }
+}
+
+// Create an accelerator table consisting of all the accelerators
+// from the menubar in the given menus
+static wxAcceleratorTable wxCreateAcceleratorTableForMenuBar(wxMenuBar* menuBar)
+{
+    wxList accelEntries;
+
+    size_t i;
+    for (i = 0; i < menuBar->GetMenuCount(); i++)
+    {
+        wxAddAccelerators(accelEntries, menuBar->GetMenu(i));
+    }
+
+    size_t n = accelEntries.GetCount();
+
+    if (n == 0)
+        return wxAcceleratorTable();
+
+    wxAcceleratorEntry* entries = new wxAcceleratorEntry[n];
+
+    for (i = 0; i < accelEntries.GetCount(); i++)
+    {
+        wxAcceleratorEntry* entry = (wxAcceleratorEntry*) accelEntries.Item(i)->GetData();
+        entries[i] = (*entry);
+        delete entry;
+
+    }
+
+    wxAcceleratorTable table(n, entries);
+    delete[] entries;
+
+    return table;
+}
+#endif // wxUSE_MENUS && wxUSE_ACCEL
+
 bool wxFrame::ShowFullScreen(bool show, long style)
 {
     if (!wxFrameBase::ShowFullScreen(show, style))
         return false;
 
+#if wxUSE_MENUS && wxUSE_ACCEL
+    if (show && GetMenuBar())
+    {
+        wxAcceleratorTable table(wxCreateAcceleratorTableForMenuBar(GetMenuBar()));
+        if (table.IsOk())
+            SetAcceleratorTable(table);
+    }
+#endif // wxUSE_MENUS && wxUSE_ACCEL
+
     wxWindow* const bar[] = {
 #if wxUSE_MENUS
         m_frameMenuBar,
@@ -288,211 +245,24 @@ bool wxFrame::ShowFullScreen(bool show, long style)
     return true;
 }
 
-void wxFrame::GtkOnSize()
+bool wxFrame::SendIdleEvents(wxIdleEvent& event)
 {
-    // avoid recursions
-    if (m_resizing) return;
-    m_resizing = true;
-
-    // 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 */
-
-    ConstrainSize();
-
-    if (m_mainWidget)
-    {
-        // 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.
+    bool needMore = wxFrameBase::SendIdleEvents(event);
 
-#if wxUSE_MENUS_NATIVE
-        int menubarHeight = 0;
+#if wxUSE_MENUS
+    if (m_frameMenuBar && m_frameMenuBar->SendIdleEvents(event))
+        needMore = true;
 #endif
-
-#if wxUSE_MENUS_NATIVE
-        if (HasVisibleMenubar())
-        {
-            int xx = m_miniEdge;
-            int yy = m_miniEdge + m_miniTitle;
-            int ww = m_width  - 2*m_miniEdge;
-            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 = menubarHeight;
-            gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
-                                  m_frameMenuBar->m_widget,
-                                  xx, yy, ww, menubarHeight);
-            client_area_y_offset += menubarHeight;
-        }
-#endif // wxUSE_MENUS_NATIVE
-
 #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
-                        + menubarHeight
+    if (m_frameToolBar && m_frameToolBar->SendIdleEvents(event))
+        needMore = true;
 #endif
-                        ;
-
-            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 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 );
-        }
-#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;
-        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 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;
-        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 );
-    }
-#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
-
-    m_resizing = false;
-}
-
-void wxFrame::OnInternalIdle()
-{
-    wxFrameBase::OnInternalIdle();
-
-#if wxUSE_MENUS_NATIVE
-    if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle();
-#endif // wxUSE_MENUS_NATIVE
-#if wxUSE_TOOLBAR
-    if (m_frameToolBar) m_frameToolBar->OnInternalIdle();
+    if (m_frameStatusBar && m_frameStatusBar->SendIdleEvents(event))
+        needMore = true;
 #endif
-#if wxUSE_STATUSBAR
-    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
+    return needMore;
 }
 
 // ----------------------------------------------------------------------------
@@ -508,25 +278,20 @@ void wxFrame::DetachMenuBar()
 
     if ( m_frameMenuBar )
     {
-        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 );
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+        hildon_window_set_menu(HILDON_WINDOW(m_widget), NULL);
+#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
+        g_object_ref( m_frameMenuBar->m_widget );
 
         gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
     }
 
     wxFrameBase::DetachMenuBar();
+
+    // make sure next size_allocate causes a wxSizeEvent
+    m_useCachedClientSize = false;
+    m_clientWidth = 0;
 }
 
 void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
@@ -535,140 +300,105 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 
     if (m_frameMenuBar)
     {
-        m_frameMenuBar->SetInvokingWindow( this );
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+        hildon_window_set_menu(HILDON_WINDOW(m_widget),
+                               GTK_MENU(m_frameMenuBar->m_widget));
+#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
 
-        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 );
+        // 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);
 
-        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);
-        }
+        // 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 );
-
-        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;
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
     }
-
-    // resize window in OnInternalIdle
-    GtkUpdateSize();
-}
-
-bool wxFrame::HasVisibleMenubar() const
-{
-    return m_frameMenuBar && m_frameMenuBar->IsShown();
+    // make sure next size_allocate causes a wxSizeEvent
+    m_useCachedClientSize = false;
+    m_clientWidth = 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") );
-
-    InsertChildFunction save = m_insertCallback;
-    m_insertCallback = wxInsertChildInFrame;
-    m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name );
-    m_insertCallback = save;
-
-    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 = gtk_widget_get_parent(m_wxwindow);
+            if (hbox == m_mainWidget)
+            {
+                hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+                gtk_widget_show(hbox);
+                gtk_box_pack_start(GTK_BOX(m_mainWidget), hbox, true, true, 0);
+                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);
         }
+        // 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_useCachedClientSize = false;
+    m_clientWidth = 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_useCachedClientSize = false;
+        statbar->m_clientWidth = 0;
+        int h = -1;
+        if (statbar->m_wxwindow)
+        {
+            // statusbar is not a native widget, need to set height request
+            h = statbar->m_height;
+        }
+        gtk_widget_set_size_request(statbar->m_widget, -1, h);
+    }
+    // make sure next size_allocate causes a wxSizeEvent
+    m_useCachedClientSize = false;
+    m_clientWidth = 0;
 }
 #endif // wxUSE_STATUSBAR