fixed a memory leak and an initialization problem

[wxWidgets.git] / src / gtk / frame.cpp

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 2371b4c5cefd5d2e29f790034d2b1bf4c80bfb37..226e26c0da39594886fb8b125511ae7a9c90aa67 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -2,431 +2,635 @@
 // Name:        frame.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        frame.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "frame.h"
+    #pragma implementation "frame.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"
+#include "wx/defs.h"
+

 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"
 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"

+#include "wx/menu.h"
+#if wxUSE_TOOLBAR
+    #include "wx/toolbar.h"
+#endif
+#if wxUSE_STATUSBAR
+    #include "wx/statusbr.h"
+#endif
+#include "wx/dcclient.h"
+
+#include <glib.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
+

 #include "wx/gtk/win_gtk.h"
 
 #include "wx/gtk/win_gtk.h"
 

-const wxMENU_HEIGHT    = 28;
-const wxSTATUS_HEIGHT  = 25;
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+const int wxMENU_HEIGHT    = 27;
+const int wxSTATUS_HEIGHT  = 25;
+const int wxPLACE_HOLDER   = 0;

 
 

-extern wxList wxTopLevelWindows;
-extern wxList wxPendingDelete;
+// ----------------------------------------------------------------------------
+// idle system
+// ----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+extern int g_openDialogs;
+
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// GTK callbacks
+// ----------------------------------------------------------------------------
+
+#if wxUSE_MENUS_NATIVE

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxFrame
+// "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

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// size

 
 

-void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
+static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )

 {
 {

-  if (!win->HasVMT()) return;
+    if (!win->m_hasVMT) return;

 
 

-/*
-  printf( "OnFrameResize from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
+    win->m_menuBarDetached = TRUE;
+    win->GtkUpdateSize();
+}

 
 

-  win->GtkOnSize( alloc->x, alloc->y, alloc->width, alloc->height );
-};
+#endif // wxUSE_MENUS_NATIVE

 
 

+#if wxUSE_TOOLBAR
+//-----------------------------------------------------------------------------
+// "child_attached" of tool bar

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// delete

 
 

-bool gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win )
+static void gtk_toolbar_attached_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();
+    win->m_toolBarDetached = FALSE;

 
 

-  return TRUE;
-};
+    win->GtkUpdateSize();
+}

 
 

+//-----------------------------------------------------------------------------
+// "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()
+static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
+    if (!win->m_hasVMT) return;

 
 

-wxFrame::wxFrame()
-{
-  m_doingOnSize = FALSE;
-  m_frameMenuBar = NULL;
-  m_frameStatusBar = NULL;
-  m_frameToolBar = NULL;
-  m_sizeSet = FALSE;
-  m_addPrivateChild = FALSE;
-  wxTopLevelWindows.Insert( this );
-};
-
-wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
+    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 )

 {
 {

-  m_doingOnSize = FALSE;
-  m_frameMenuBar = NULL;
-  m_frameStatusBar = NULL;
-  m_frameToolBar = NULL;
-  m_sizeSet = FALSE;
-  m_addPrivateChild = FALSE;
-  Create( parent, id, title, pos, size, style, name );
-  wxTopLevelWindows.Insert( this );
-};
-
-bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
+    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_needParent = FALSE;
-  m_mainWindow = NULL;
-  m_wxwindow = NULL;
+    m_menuBarDetached = FALSE;
+    m_toolBarDetached = FALSE;
+}

 
 

-  PreCreation( parent, id, pos, size, style, name );
+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;
+    return rt;
+}

 
 

-  m_doingOnSize = FALSE;
+wxFrame::~wxFrame()
+{
+    m_isBeingDeleted = TRUE;
+    DeleteAllBars();
+}

 
 

-  m_title = title;
+// ----------------------------------------------------------------------------
+// overridden wxWindow methods
+// ----------------------------------------------------------------------------

 
 

-  m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-  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 );
+void wxFrame::DoGetClientSize( int *width, int *height ) const
+{
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+    
+    wxTopLevelWindow::DoGetClientSize( width, height );

 
 

-  gtk_window_set_title( GTK_WINDOW(m_widget), title );
-  GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
+    if (height)
+    {
+#if wxUSE_MENUS_NATIVE
+        /* menu bar */
+        if (m_frameMenuBar)
+        {
+            if (!m_menuBarDetached)
+                (*height) -= wxMENU_HEIGHT;
+            else
+                (*height) -= wxPLACE_HOLDER;
+        }
+#endif // wxUSE_MENUS_NATIVE
+
+#if wxUSE_STATUSBAR
+        /* status bar */
+        if (m_frameStatusBar && m_frameStatusBar->IsShown()) 
+            (*height) -= wxSTATUS_HEIGHT;
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+        /* tool bar */
+        if (m_frameToolBar && m_frameToolBar->IsShown())
+        {
+            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;
+                }
+            }
+        }
+#endif // wxUSE_TOOLBAR
+    }
+}

 
 

-  gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL);
+void wxFrame::DoSetClientSize( int width, int height )
+{
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+
+#if wxUSE_MENUS_NATIVE
+        /* menu bar */
+        if (m_frameMenuBar)
+        {
+            if (!m_menuBarDetached)
+                height += wxMENU_HEIGHT;
+            else
+                height += wxPLACE_HOLDER;
+        }
+#endif // wxUSE_MENUS_NATIVE
+
+#if wxUSE_STATUSBAR
+        /* status bar */
+        if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT;
+#endif

 
 

-  gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
-    GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );
+#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->GetWindowStyle() & wxTB_VERTICAL )
+                {
+                    width += x;
+                }
+                else
+                {
+                    height += y;
+                }
+            }
+        }
+#endif

 
 

-  m_mainWindow = gtk_myfixed_new();
-  gtk_widget_show( m_mainWindow );
-  GTK_WIDGET_UNSET_FLAGS( m_mainWindow, GTK_CAN_FOCUS );
+    wxTopLevelWindow::DoSetClientSize( width, height );
+}

 
 

-  gtk_container_add( GTK_CONTAINER(m_widget), m_mainWindow );
-  gtk_widget_set_uposition( m_mainWindow, 0, 0 );
+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;

 
 

-  m_wxwindow = gtk_myfixed_new();
-  gtk_widget_show( m_wxwindow );
-  GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
+    /* avoid recursions */
+    if (m_resizing) return;
+    m_resizing = TRUE;

 
 

-  gtk_container_add( GTK_CONTAINER(m_mainWindow), m_wxwindow );
+    /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */
+    wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );

 
 

-  gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
-    GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
+    m_width = width;
+    m_height = height;

 
 

-  PostCreation();
+    /* space occupied by m_frameToolBar and m_frameMenuBar */
+    int client_area_x_offset = 0,
+        client_area_y_offset = 0;

 
 

-  gtk_widget_realize( m_mainWindow );
+    /* 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 */

 
 

-  return TRUE;
-};
+    if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
+    if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
+    if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
+    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;

 
 

-wxFrame::~wxFrame()
-{
-  if (m_frameMenuBar) delete m_frameMenuBar;
-  if (m_frameStatusBar) delete m_frameStatusBar;
+    if (m_mainWidget)
+    {
+        /* set size hints */
+        gint flag = 0; // GDK_HINT_POS;
+        if ((m_minWidth != -1) || (m_minHeight != -1)) flag |= GDK_HINT_MIN_SIZE;
+        if ((m_maxWidth != -1) || (m_maxHeight != -1)) flag |= GDK_HINT_MAX_SIZE;
+        GdkGeometry geom;
+        geom.min_width = m_minWidth;
+        geom.min_height = m_minHeight;
+        geom.max_width = m_maxWidth;
+        geom.max_height = m_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 = wxMENU_HEIGHT;
+            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
+
+#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 += wxMENU_HEIGHT;
+                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
+            {
+                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 (m_mainWindow) gtk_widget_destroy( m_mainWindow );
+#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

 
 

-  wxTopLevelWindows.DeleteObject( this );
-  if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
-};
+    m_sizeSet = TRUE;

 
 

-bool wxFrame::Show( bool show )
-{
-  if (show)
-  {
+    // send size event to frame

     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );

-    m_sizeSet = FALSE;
-    ProcessEvent( event );
-  };
-  return wxWindow::Show( show );
-};
-
-void wxFrame::Enable( bool enable )
-{
-  wxWindow::Enable( enable );
-  gtk_widget_set_sensitive( m_mainWindow, enable );
-};
+    event.SetEventObject( this );
+    GetEventHandler()->ProcessEvent( event );

 
 

-void wxFrame::OnCloseWindow( wxCloseEvent &event )
-{
-    if ( GetEventHandler()->OnClose() || event.GetForce())
+#if wxUSE_STATUSBAR
+    // send size event to status bar
+    if (m_frameStatusBar)

     {
     {

-        this->Destroy();
+        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

 
 

-bool wxFrame::Destroy()
+    m_resizing = FALSE;
+}
+
+void wxFrame::OnInternalIdle()

 {
 {

-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
+    wxTopLevelWindow::OnInternalIdle();

 
 

-  return TRUE;
+#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) m_frameStatusBar->OnInternalIdle();
+#endif

 }
 
 }
 

-void wxFrame::GetClientSize( int *width, int *height ) const
+// ----------------------------------------------------------------------------
+// menu/tool/status bar stuff
+// ----------------------------------------------------------------------------
+
+#if wxUSE_MENUS_NATIVE
+
+void wxFrame::DetachMenuBar()

 {
 {

-  wxWindow::GetClientSize( width, height );
-  if (height)
-  {
-    if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT;
-    if (m_frameStatusBar) (*height) -= 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( NULL, &y );
-      (*height) -= y;
+        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_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );
+        gtk_widget_ref( m_frameMenuBar->m_widget );
+        gtk_widget_unparent( m_frameMenuBar->m_widget );

     }
     }

-  };
-};

 
 

-void wxFrame::GtkOnSize( int x, int y, int width, int height )
-{
-  m_x = x;
-  m_y = y;
-
-  if ((m_height == height) && (m_width == width) &&
-      (m_sizeSet)) return;
-  if (!m_mainWindow) return;
-  if (!m_wxwindow) return;
-
-  m_width = width;
-  m_height = height;
-
-  gtk_widget_set_usize( m_widget, width, height );
-
-  int main_x = 0;
-  int main_y = 0;
-  int main_height = height;
-  int main_width = width;
-
-  // This emulates Windows behaviour:
-  // The menu bar is part of the main window, but the status bar
-  // is on the implementation side in the client area. The
-  // function GetClientSize returns the size of the client area
-  // minus the status bar height. Under wxGTK, the main window
-  // is represented by m_mainWindow. The menubar is inserted
-  // into m_mainWindow whereas the statusbar is insertes into
-  // m_wxwindow just like any other window.
-
-//  not really needed
-  gtk_widget_set_usize( m_mainWindow, width, height );
-
-  if (m_frameMenuBar)
-  {
-    main_y = wxMENU_HEIGHT;
-    main_height -= wxMENU_HEIGHT;
-  };
-
-  int toolbar_height = 0;
-  if (m_frameToolBar) m_frameToolBar->GetSize( NULL, &toolbar_height );
-  
-  main_y += toolbar_height;
-  main_height -= toolbar_height;
-  
-  gtk_widget_set_uposition( GTK_WIDGET(m_wxwindow), main_x, main_y );
-  gtk_widget_set_usize( GTK_WIDGET(m_wxwindow), main_width, main_height );
-
-  if (m_frameMenuBar)
-  {
-    gtk_widget_set_uposition( m_frameMenuBar->m_widget, 1, 1 );
-    gtk_widget_set_usize( m_frameMenuBar->m_widget, width-2, wxMENU_HEIGHT-2 );
-  };
-
-  if (m_frameToolBar)
-  {
-    gtk_widget_set_uposition( m_frameToolBar->m_widget, 1, wxMENU_HEIGHT );
-    gtk_widget_set_usize( m_frameToolBar->m_widget, width-2, toolbar_height );
-  };
-  
-  if (m_frameStatusBar)
-  {
-    m_frameStatusBar->SetSize( 0, main_height-wxSTATUS_HEIGHT, width, wxSTATUS_HEIGHT );
-  };
-
-  m_sizeSet = TRUE;
-
-  wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-  event.SetEventObject( this );
-  ProcessEvent( event );
-};
-
-void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
-{
-  if ( GetAutoLayout() )
-    Layout();
-  else {
-    // no child: go out !
-    if (!GetChildren()->First())
-      return;
-      
-    // do we have exactly one child?
-    wxWindow *child = NULL;
-    for(wxNode *node = GetChildren()->First(); node; node = node->Next())
-    {
-      wxWindow *win = (wxWindow *)node->Data();
-      if (!win->IsKindOf(CLASSINFO(wxFrame)) &&
-          !win->IsKindOf(CLASSINFO(wxDialog))
-#if 0  // not in m_children anyway
-          && (win != m_frameMenuBar) &&
-             (win != m_frameToolBar) &&
-             (win != m_frameStatusBar)
-#endif
-         )
-      {
-        if ( child )  // it's the second one: do nothing
-          return;
-
-        child = win;
-      };
-    };
-
-    // 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);
-  }
-};
-
-void wxFrame::AddChild( wxWindow *child )
-{
-  if (m_addPrivateChild)
-  {
-    gtk_myfixed_put( GTK_MYFIXED(m_mainWindow), child->m_widget, child->m_x, child->m_y );
-      
-    gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height );
-  }
-  else
-  {
-    m_children.Append( child );
-    
-    if (m_wxwindow)
-      gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), child->m_widget, child->m_x, child->m_y );
-      
-    gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height );
-  }    
-};
-
-static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
-{
-  menu->SetInvokingWindow( win );
-  wxNode *node = menu->m_items.First();
-  while (node)
-  {
-    wxMenuItem *menuitem = (wxMenuItem*)node->Data();
-    if (menuitem->IsSubMenu())
-      SetInvokingWindow( menuitem->GetSubMenu(), win );
-    node = node->Next();
-  };
-};
-
-void wxFrame::SetMenuBar( wxMenuBar *menuBar )
+    wxFrameBase::DetachMenuBar();
+}
+
+void wxFrame::AttachMenuBar( wxMenuBar *menuBar )

 {
 {

-  m_frameMenuBar = menuBar;
-  
-  if (m_frameMenuBar)
-  {
-    if (m_frameMenuBar->m_parent != this)
+    wxFrameBase::AttachMenuBar(menuBar);
+
+    if (m_frameMenuBar)

     {
     {

-      wxNode *node = m_frameMenuBar->m_menus.First();
-      while (node)
-      {
-        wxMenu *menu = (wxMenu*)node->Data();
-        SetInvokingWindow( menu, this );
-        node = node->Next();
-      };
-  
-      m_frameMenuBar->m_parent = this;
-      gtk_myfixed_put( GTK_MYFIXED(m_mainWindow),
-        m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
+        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 );

     }
     }

-  }
-};

 
 

-wxMenuBar *wxFrame::GetMenuBar(void)
-{
-  return m_frameMenuBar;
-};
+    /* resize window in OnInternalIdle */
+    m_sizeSet = FALSE;
+}

 
 

-wxToolBar *wxFrame::CreateToolBar( int style, int WXUNUSED(orientation), int WXUNUSED(rowsOrColumns) )
-{
-  m_addPrivateChild = TRUE;
-  
-  m_frameToolBar = new wxToolBar( this, -1, wxDefaultPosition, wxDefaultSize, style );
-  
-  m_addPrivateChild = FALSE;
-  
-  return m_frameToolBar;
-};
-
-wxToolBar *wxFrame::GetToolBar(void)
-{
-  return m_frameToolBar;
-};
+#endif // wxUSE_MENUS_NATIVE
+
+#if wxUSE_TOOLBAR

 
 

-bool wxFrame::CreateStatusBar( int number )
+wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& name )

 {
 {

-  if (m_frameStatusBar)
-  delete m_frameStatusBar;
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

 
 

-  m_frameStatusBar = new wxStatusBar( this, -1, wxPoint(0,0), wxSize(100,20) );
+    m_insertInClientArea = FALSE;

 
 

-  m_frameStatusBar->SetFieldsCount( number );
-  return TRUE;
-};
+    m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name );

 
 

-void wxFrame::SetStatusText( const wxString &text, int number )
-{
-  if (m_frameStatusBar) m_frameStatusBar->SetStatusText( text, number );
-};
+    m_insertInClientArea = TRUE;

 
 

-void wxFrame::SetStatusWidths( int n, int *width )
-{
-  if (m_frameStatusBar) m_frameStatusBar->SetStatusWidths( n, width );
-};
+    m_sizeSet = FALSE;
+
+    return m_frameToolBar;
+}

 
 

-wxStatusBar *wxFrame::GetStatusBar(void)
+void wxFrame::SetToolBar(wxToolBar *toolbar)

 {
 {

-  return m_frameStatusBar;
-};
+    wxFrameBase::SetToolBar(toolbar);

 
 

-void wxFrame::SetTitle( const wxString &title )
+    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 );
+
+            gtk_widget_reparent( m_frameToolBar->m_widget, m_mainWidget );
+            GtkUpdateSize();
+        }
+    }
+}
+
+#endif // wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR
+
+wxStatusBar* wxFrame::CreateStatusBar(int number,
+                                      long style,
+                                      wxWindowID id,
+                                      const wxString& name)

 {
 {

-  m_title = title;
-  gtk_window_set_title( GTK_WINDOW(m_widget), title );
-};
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

 
 

-void wxFrame::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW) )
+    // because it will change when toolbar is added
+    m_sizeSet = FALSE;
+
+    return wxFrameBase::CreateStatusBar( number, style, id, name );
+}
+
+void wxFrame::PositionStatusBar()

 {
 {

-  if (m_wxwindow)
-    gdk_window_set_hints( m_wxwindow->window, -1, -1, 
-                         minW, minH, maxW, maxH, GDK_HINT_MIN_SIZE | GDK_HINT_MIN_SIZE );
+    if ( !m_frameStatusBar )
+        return;
+
+    m_sizeSet = FALSE;

 }
 }

+#endif // wxUSE_STATUSBAR
+