X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e52f60e65236befe1a509cc3c1823607be0d2b3c..d2b23b67301bd2d286366d4326a21da3132558fa:/src/gtk/frame.cpp

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index edce82c9fc..feaf71767f 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,596 +7,722 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "frame.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #include "wx/frame.h"
-#include "wx/dialog.h"
-#include "wx/control.h"
-#include "wx/app.h"
-#include "wx/menu.h"
-#include "wx/toolbar.h"
-#include "wx/statusbr.h"
-#include "wx/dcclient.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/menu.h"
+    #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
+#endif // WX_PRECOMP
+
+#include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // constants
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
-const int wxMENU_HEIGHT    = 30;
-const int wxSTATUS_HEIGHT  = 25;
+static const int wxSTATUS_HEIGHT  = 25;
+static const int wxPLACE_HOLDER   = 0;
 
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------
 
-extern wxList wxTopLevelWindows;
-extern wxList wxPendingDelete;
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// GTK callbacks
+// ----------------------------------------------------------------------------
+
+#if wxUSE_MENUS_NATIVE
 
 //-----------------------------------------------------------------------------
-// "size_allocate"
+// "child_attached" of menu bar
 //-----------------------------------------------------------------------------
 
-static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
+extern "C" {
+static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
-    if (!win->HasVMT()) return;
-    
-/*
-    printf( "OnFrameResize from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
-    
-   if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
-   {
-       win->m_sizeSet = FALSE;
-       win->m_width = alloc->width;
-       win->m_height = alloc->height;
-   }
+    if (!win->m_hasVMT) return;
+
+    win->m_menuBarDetached = false;
+    win->GtkUpdateSize();
+}
 }
 
 //-----------------------------------------------------------------------------
-// "delete_event"
+// "child_detached" of menu bar
 //-----------------------------------------------------------------------------
 
-static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win )
+extern "C" {
+static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
-/*
-    printf( "OnDelete from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
+    if (!win->m_hasVMT) return;
 
-    win->Close();
+    // Raise the client area area
+    gdk_window_raise( win->m_wxwindow->window );
 
-    return TRUE;
+    win->m_menuBarDetached = true;
+    win->GtkUpdateSize();
+}
 }
 
+#endif // wxUSE_MENUS_NATIVE
+
+#if wxUSE_TOOLBAR
 //-----------------------------------------------------------------------------
-// "configure_event"
+// "child_attached" of tool bar
 //-----------------------------------------------------------------------------
 
-static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
+extern "C" {
+static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
-    if (!win->HasVMT()) return FALSE;
-  
-    win->m_x = event->x;
-    win->m_y = event->y;
-  
-    return FALSE;
+    if (!win->m_hasVMT) return;
+
+    win->m_toolBarDetached = false;
+    win->GtkUpdateSize();
+}
 }
 
 //-----------------------------------------------------------------------------
-// wxFrame
+// "child_detached" of tool bar
 //-----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxFrame, wxWindow)
-    EVT_SIZE(wxFrame::OnSize)
-    EVT_CLOSE(wxFrame::OnCloseWindow)
-    EVT_IDLE(wxFrame::OnIdle)
-END_EVENT_TABLE()
+extern "C" {
+static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
+{
+    if (!win->m_hasVMT) return;
 
-IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
+    // Raise the client area area
+    gdk_window_raise( win->m_wxwindow->window );
 
-wxFrame::wxFrame()
-{
-    m_frameMenuBar = (wxMenuBar *) NULL;
-    m_frameStatusBar = (wxStatusBar *) NULL;
-    m_frameToolBar = (wxToolBar *) NULL;
-    m_sizeSet = FALSE;
-    wxTopLevelWindows.Insert( this );
+    win->m_toolBarDetached = true;
+    win->GtkUpdateSize();
 }
-
-wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
-{
-    m_frameMenuBar = (wxMenuBar *) NULL;
-    m_frameStatusBar = (wxStatusBar *) NULL;
-    m_frameToolBar = (wxToolBar *) NULL;
-    m_sizeSet = FALSE;
-    Create( parent, id, title, pos, size, style, name );
-    wxTopLevelWindows.Insert( this );
 }
+#endif // wxUSE_TOOLBAR
 
-bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
-{
-    m_needParent = FALSE;
-
-    PreCreation( parent, id, pos, size, style, name );
 
-    m_title = title;
+// ----------------------------------------------------------------------------
+// wxFrame itself
+// ----------------------------------------------------------------------------
 
-    GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
-    if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP;
-  
-    m_widget = gtk_window_new( win_type );
-    
-    if ((size.x != -1) && (size.y != -1))
-        gtk_widget_set_usize( m_widget, m_width, m_height );
-    if ((pos.x != -1) && (pos.y != -1))
-        gtk_widget_set_uposition( m_widget, m_x, m_y );
-
-    gtk_window_set_title( GTK_WINDOW(m_widget), title );
-    GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
+//-----------------------------------------------------------------------------
+// InsertChild for wxFrame
+//-----------------------------------------------------------------------------
 
-    gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL );
+/* 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. */
 
-    gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
-        GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );
+static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
+{
+    wxASSERT( GTK_IS_WIDGET(child->m_widget) );
 
-    m_wxwindow = gtk_myfixed_new();
-    gtk_widget_show( m_wxwindow );
-    GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
+    if (!parent->m_insertInClientArea)
+    {
+        // These are outside the client area
+        wxFrame* frame = (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))
+        {
+            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),
+                         child->m_widget,
+                         child->m_x,
+                         child->m_y,
+                         child->m_width,
+                         child->m_height );
+    }
+}
 
-    gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
+// ----------------------------------------------------------------------------
+// wxFrame creation
+// ----------------------------------------------------------------------------
 
-    gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
-        GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
+void wxFrame::Init()
+{
+    m_menuBarDetached = false;
+    m_toolBarDetached = false;
+    m_menuBarHeight = 2;
+}
+
+bool wxFrame::Create( wxWindow *parent,
+                      wxWindowID id,
+                      const wxString& title,
+                      const wxPoint& pos,
+                      const wxSize& sizeOrig,
+                      long style,
+                      const wxString &name )
+{
+    bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig,
+                                       style, name);
+    m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame;
 
-    gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
-        GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this );
-    
-    if (m_parent) m_parent->AddChild( this );
-  
-    PostCreation();
-    
-    return TRUE;
+    return rt;
 }
 
 wxFrame::~wxFrame()
 {
-    if (m_frameMenuBar) delete m_frameMenuBar;
-    if (m_frameStatusBar) delete m_frameStatusBar;
-    if (m_frameToolBar) delete m_frameToolBar;
-
-    wxTopLevelWindows.DeleteObject( this );
-    if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
+    m_isBeingDeleted = true;
+    DeleteAllBars();
 }
 
-bool wxFrame::Show( bool show )
+// ----------------------------------------------------------------------------
+// overridden wxWindow methods
+// ----------------------------------------------------------------------------
+
+void wxFrame::DoGetClientSize( int *width, int *height ) const
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-    if (show)
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+
+    wxTopLevelWindow::DoGetClientSize( width, height );
+
+    if (height)
     {
-/*
-        wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-        m_sizeSet = FALSE;
-        GetEventHandler()->ProcessEvent( event );
-*/
+#if wxUSE_MENUS_NATIVE
+        // menu bar
+        if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR) != 0))
+        {
+            if (!m_menuBarDetached)
+                (*height) -= m_menuBarHeight;
+            else
+                (*height) -= wxPLACE_HOLDER;
+        }
+#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 // wxUSE_STATUSBAR
     }
-    return wxWindow::Show( show );
-}
 
-void wxFrame::OnCloseWindow( wxCloseEvent &event )
-{
-    if (GetEventHandler()->OnClose() || event.GetForce()) this->Destroy();
+#if wxUSE_TOOLBAR
+    // tool bar
+    if (m_frameToolBar && m_frameToolBar->IsShown())
+    {
+        if (m_toolBarDetached)
+        {
+            if (height != NULL)
+                *height -= wxPLACE_HOLDER;
+        }
+        else
+        {
+            int x, y;
+            m_frameToolBar->GetSize( &x, &y );
+            if ( m_frameToolBar->IsVertical() )
+            {
+                if (width != NULL)
+                    *width -= x;
+            }
+            else
+            {
+                if (height != NULL)
+                    *height -= y;
+            }
+        }
+    }
+#endif // wxUSE_TOOLBAR
+
+    if (width != NULL && *width < 0)
+        *width = 0;
+    if (height != NULL && *height < 0)
+        *height = 0;
 }
 
-bool wxFrame::Destroy()
+void wxFrame::DoSetClientSize( int width, int height )
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-    if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
-    return TRUE;
-}
+#if wxUSE_MENUS_NATIVE
+        // menu bar
+        if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR) != 0))
+        {
+            if (!m_menuBarDetached)
+                height += m_menuBarHeight;
+            else
+                height += wxPLACE_HOLDER;
+        }
+#endif // wxUSE_MENUS_NATIVE
 
-wxPoint wxFrame::GetClientAreaOrigin() const
-{
-    wxPoint pt(0, 0);
-    if (m_frameMenuBar)
-    {
-        int h = 0;
-        m_frameMenuBar->GetSize( (int*)NULL, &h );
-        pt.y += h + 2;
-    }
-    if (m_frameToolBar)
-    {
-        int h = 0;
-        m_frameToolBar->GetSize( (int*)NULL, &h );
-        pt.y += h;
-    }
-    return pt;
+#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())
+        {
+            if (m_toolBarDetached)
+            {
+                height += wxPLACE_HOLDER;
+            }
+            else
+            {
+                int x, y;
+                m_frameToolBar->GetSize( &x, &y );
+                if ( m_frameToolBar->IsVertical() )
+                {
+                    width += x;
+                }
+                else
+                {
+                    height += y;
+                }
+            }
+        }
+#endif
+
+    wxTopLevelWindow::DoSetClientSize( width, height );
 }
 
-void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
+void wxFrame::GtkOnSize()
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-  
-    // Don't do anything for children of wxMDIChildFrame
-    if (!m_wxwindow) return;
-
-    if (m_resizing) return; // I don't like recursions
-    m_resizing = TRUE;
-
-    int old_x = m_x;
-    int old_y = m_y;
-    int old_width = m_width;
-    int old_height = m_height;
-  
-    if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
+    // 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 */
+
+    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)
     {
-        if (x != -1) m_x = x;
-        if (y != -1) m_y = y;
-        if (width != -1) m_width = width;
-        if (height != -1) m_height = height;
+        // TODO
+        // Rewrite this terrible code to using GtkVBox
+
+        // m_mainWidget holds the menubar, the toolbar and the client
+        // area, which is represented by m_wxwindow.
+
+#if wxUSE_MENUS_NATIVE
+        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 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;
+
+            // 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_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;
+            }
+
+            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
     {
-        m_x = x;
-        m_y = y;
-        m_width = width;
-        m_height = height;
+        // 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 ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
+#if wxUSE_STATUSBAR
+    if (m_frameStatusBar && m_frameStatusBar->IsShown() &&
+        !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR) != 0))
     {
-        if (width == -1) m_width = 80;
+        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 );
     }
-
-    if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT)
+    else
     {
-       if (height == -1) m_height = 26;
+        if (m_frameStatusBar)
+        {
+            if (GTK_WIDGET_VISIBLE(m_frameStatusBar->m_widget))
+                gtk_widget_hide( m_frameStatusBar->m_widget );
+        }
     }
-  
-    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_minWidth;
-    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
+#endif // wxUSE_STATUSBAR
 
-    if ((m_x != -1) || (m_y != -1))
-    {
-        if ((m_x != old_x) || (m_y != old_y)) 
-            gtk_widget_set_uposition( m_widget, m_x, m_y );
-    }
-  
-    if ((m_width != old_width) || (m_height != old_height))
-    {
-        gtk_widget_set_usize( m_widget, m_width, m_height );
-    }
-  
-    m_sizeSet = TRUE;
+    m_sizeSet = true;
 
+    // send size event to frame
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
 
-    m_resizing = FALSE;
-}
+#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
 
-void wxFrame::SetSize( int width, int height )
-{
-    SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
+    m_resizing = false;
 }
 
-void wxFrame::Centre( int direction )
+void wxFrame::OnInternalIdle()
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-    int x = 0;
-    int y = 0;
-    
-    if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
-    if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;
-  
-    Move( x, y );
-}
+    wxFrameBase::OnInternalIdle();
 
-void wxFrame::GetClientSize( int *width, int *height ) const
-{
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-    wxWindow::GetClientSize( width, height );
-    if (height)
+#if wxUSE_MENUS_NATIVE
+    if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle();
+#endif // wxUSE_MENUS_NATIVE
+#if wxUSE_TOOLBAR
+    if (m_frameToolBar) m_frameToolBar->OnInternalIdle();
+#endif
+#if wxUSE_STATUSBAR
+    if (m_frameStatusBar)
     {
-        if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT;
-        if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
-        if (m_frameToolBar)
+        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() )
         {
-            int y = 0;
-            m_frameToolBar->GetSize( (int *) NULL, &y );
-            (*height) -= y;
+            wxWindow *child = node->GetData();
+            child->OnInternalIdle();
         }
     }
+#endif
 }
 
-void wxFrame::SetClientSize( int const width, int const height )
+// ----------------------------------------------------------------------------
+// menu/tool/status bar stuff
+// ----------------------------------------------------------------------------
+
+#if wxUSE_MENUS_NATIVE
+
+void wxFrame::DetachMenuBar()
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-    int h = height;
-    if (m_frameMenuBar) h += wxMENU_HEIGHT;
-    if (m_frameStatusBar) h += wxSTATUS_HEIGHT;
-    if (m_frameToolBar)
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+    wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
+
+    if ( m_frameMenuBar )
     {
-        int y = 0;
-        m_frameToolBar->GetSize( (int *) NULL, &y );
-        h += y;
-    }
-    wxWindow::SetClientSize( width, h );
-}
+        m_frameMenuBar->UnsetInvokingWindow( this );
 
-void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
-{
-    // due to a bug in gtk, x,y are always 0
-    // m_x = x;
-    // m_y = y;
+        if (m_frameMenuBar->GetWindowStyle() & wxMB_DOCKABLE)
+        {
+            g_signal_handlers_disconnect_by_func (m_frameMenuBar->m_widget,
+                    (gpointer) gtk_menu_attached_callback,
+                    this);
 
-    if (m_resizing) return;
-    m_resizing = TRUE;
-    
-    if (!m_wxwindow) return;
-  
-    m_width = width;
-    m_height = height;
-  
-    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_minWidth;
-    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
-
-//    gtk_widget_set_usize( m_widget, m_width, m_height );
-    
-    // This emulates the new wxMSW behaviour
+            g_signal_handlers_disconnect_by_func (m_frameMenuBar->m_widget,
+                    (gpointer) gtk_menu_detached_callback,
+                    this);
+        }
 
-    if (m_frameMenuBar)
-    {
-        m_frameMenuBar->m_x = 1;  
-        m_frameMenuBar->m_y = 1;
-        m_frameMenuBar->m_width = m_width-2;
-        m_frameMenuBar->m_height = wxMENU_HEIGHT-2;
-        gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameMenuBar->m_widget, 1, 1 );
-        gtk_widget_set_usize( m_frameMenuBar->m_widget, m_width-2, wxMENU_HEIGHT-2 );
-    }
+        gtk_widget_ref( m_frameMenuBar->m_widget );
 
-    if (m_frameToolBar)
-    {
-        int y = 0;
-        if (m_frameMenuBar) y = wxMENU_HEIGHT;
-        int h = m_frameToolBar->m_height;
-    
-        m_frameToolBar->m_x = 2;  
-        gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameToolBar->m_widget, 2, y );
-        gtk_widget_set_usize( m_frameToolBar->m_widget, m_width-3, h );
+        gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );
     }
-  
-    if (m_frameStatusBar)
-    {
-        // OK, 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.
-        m_frameStatusBar->m_x = 0;  
-        m_frameStatusBar->m_y = m_height-wxSTATUS_HEIGHT;
-        m_frameStatusBar->m_width = m_width;
-        m_frameStatusBar->m_height = wxSTATUS_HEIGHT;
-        gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, 0, m_height-wxSTATUS_HEIGHT );
-        gtk_widget_set_usize( m_frameStatusBar->m_widget, m_width, wxSTATUS_HEIGHT );
-    }
-    
-    m_sizeSet = TRUE;
-    
-    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( event );
-    
-    m_resizing = FALSE;
-}
 
-void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event) )
-{
-    if (!m_sizeSet)
-        GtkOnSize( m_x, m_y, m_width, m_height );
-  
-    DoMenuUpdates();
+    wxFrameBase::DetachMenuBar();
 }
 
-void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
+void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-    if (GetAutoLayout())
-    {
-        Layout();
-    }
-    else 
+    wxFrameBase::AttachMenuBar(menuBar);
+
+    if (m_frameMenuBar)
     {
-        // no child: go out !
-        if (!GetChildren()->First()) return;
-      
-        // do we have exactly one child?
-        wxWindow *child = (wxWindow *) NULL;
-        for(wxNode *node = GetChildren()->First(); node; node = node->Next())
+        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)
         {
-            wxWindow *win = (wxWindow *)node->Data();
-            if (!IS_KIND_OF(win,wxFrame) && !IS_KIND_OF(win,wxDialog)
-#if 0  // not in m_children anyway ?
-              && (win != m_frameMenuBar) &&
-              (win != m_frameToolBar) &&
-              (win != m_frameStatusBar)
-#endif
-            )
-            {
-	        // it's the second one: do nothing
-                if (child) return;
-                child = win;
-            }
+            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);
         }
 
-        // yes: set it's size to fill all the frame
-        int client_x, client_y;
-        GetClientSize( &client_x, &client_y );
-        child->SetSize( 1, 1, client_x-2, client_y);
-    }
-}
+        gtk_widget_show( m_frameMenuBar->m_widget );
 
-static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
-{
-    menu->SetInvokingWindow( win );
-    wxNode *node = menu->m_items.First();
-    while (node)
+        UpdateMenuBarSize();
+    }
+    else
     {
-        wxMenuItem *menuitem = (wxMenuItem*)node->Data();
-        if (menuitem->IsSubMenu())
-            SetInvokingWindow( menuitem->GetSubMenu(), win );
-        node = node->Next();
+        m_menuBarHeight = 2;
+        GtkUpdateSize();        // resize window in OnInternalIdle
     }
 }
 
-void wxFrame::SetMenuBar( wxMenuBar *menuBar )
+void wxFrame::UpdateMenuBarSize()
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-    wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" );
-  
-    m_frameMenuBar = menuBar;
-  
-    if (m_frameMenuBar)
+    m_menuBarHeight = 2;
+
+    // this is called after Remove with a NULL m_frameMenuBar
+    if ( m_frameMenuBar )
     {
-        wxNode *node = m_frameMenuBar->m_menus.First();
-        while (node)
-        {
-            wxMenu *menu = (wxMenu*)node->Data();
-            SetInvokingWindow( menu, this );
-            node = node->Next();
-        }
-    
-        if (m_frameMenuBar->m_parent != this)
-        {
-            m_frameMenuBar->m_parent = this;
-            gtk_myfixed_put( GTK_MYFIXED(m_wxwindow),
-                m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
-        }
+        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;
     }
-}
 
-wxMenuBar *wxFrame::GetMenuBar(void) const
-{
-    return m_frameMenuBar;
+    // resize window in OnInternalIdle
+    GtkUpdateSize();
 }
 
-wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
-{
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-    wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" );
-
-    m_frameToolBar = OnCreateToolBar( style, id, name );
-  
-    GetChildren()->DeleteObject( m_frameToolBar );
-  
-    return m_frameToolBar;
-}
+#endif // wxUSE_MENUS_NATIVE
 
-wxToolBar* wxFrame::OnCreateToolBar( long style, wxWindowID id, const wxString& name )
+#if wxUSE_TOOLBAR
+
+wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& name )
 {
-    return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name );
-}
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
-wxToolBar *wxFrame::GetToolBar(void) const 
-{ 
-    return m_frameToolBar; 
-}
+    m_insertInClientArea = false;
 
-wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
-{
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-    wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" );
+    m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name );
+
+    m_insertInClientArea = true;
 
-    m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
-  
-    return m_frameStatusBar;
+    GtkUpdateSize();
+
+    return m_frameToolBar;
 }
 
-wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
+void wxFrame::SetToolBar(wxToolBar *toolbar)
 {
-    wxStatusBar *statusBar = (wxStatusBar *) NULL;
-    
-    statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20), style, name);
-    
-    // Set the height according to the font and the border size
-    wxClientDC dc(statusBar);
-    dc.SetFont( *statusBar->GetFont() );
-
-    long x, y;
-    dc.GetTextExtent( "X", &x, &y );
+    bool hadTbar = m_frameToolBar != NULL;
 
-    int height = (int)( (y  * 1.1) + 2* statusBar->GetBorderY());
+    wxFrameBase::SetToolBar(toolbar);
 
-    statusBar->SetSize( -1, -1, 100, height );
+    if ( m_frameToolBar )
+    {
+        // insert into toolbar area if not already there
+        if ((m_frameToolBar->m_widget->parent) &&
+            (m_frameToolBar->m_widget->parent != m_mainWidget))
+        {
+            GetChildren().DeleteObject( m_frameToolBar );
 
-    statusBar->SetFieldsCount( number );
-    return statusBar;
+            gtk_widget_reparent( m_frameToolBar->m_widget, m_mainWidget );
+            GtkUpdateSize();
+        }
+    }
+    else // toolbar unset
+    {
+        // still need to update size if it had been there before
+        if ( hadTbar )
+        {
+            GtkUpdateSize();
+        }
+    }
 }
 
-void wxFrame::SetStatusText(const wxString& text, int number)
-{
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-    wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
+#endif // wxUSE_TOOLBAR
 
-    m_frameStatusBar->SetStatusText(text, number);
-}
+#if wxUSE_STATUSBAR
 
-void wxFrame::SetStatusWidths(int n, const int widths_field[] )
+wxStatusBar* wxFrame::CreateStatusBar(int number,
+                                      long style,
+                                      wxWindowID id,
+                                      const wxString& name)
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-    wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
-    m_frameStatusBar->SetStatusWidths(n, widths_field);
-}
+    // because it will change when toolbar is added
+    GtkUpdateSize();
 
-wxStatusBar *wxFrame::GetStatusBar(void) const
-{
-    return m_frameStatusBar;
+    return wxFrameBase::CreateStatusBar( number, style, id, name );
 }
 
-void wxFrame::SetTitle( const wxString &title )
+void wxFrame::SetStatusBar(wxStatusBar *statbar)
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-    m_title = title;
-    if (m_title.IsNull()) m_title = "";
-    gtk_window_set_title( GTK_WINDOW(m_widget), title );
+    bool hadStatBar = m_frameStatusBar != NULL;
+
+    wxFrameBase::SetStatusBar(statbar);
+
+    if (hadStatBar && !m_frameStatusBar)
+        GtkUpdateSize();
 }
 
-void wxFrame::SetIcon( const wxIcon &icon )
+void wxFrame::PositionStatusBar()
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-    m_icon = icon;
-    if (!icon.Ok()) return;
-  
-    wxMask *mask = icon.GetMask();
-    GdkBitmap *bm = (GdkBitmap *) NULL;
-    if (mask) bm = mask->GetBitmap();
-  
-    gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
+    if ( !m_frameStatusBar )
+        return;
+
+    GtkUpdateSize();
 }
+#endif // wxUSE_STATUSBAR