[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 3065a36071e5e8e143d4171ba4ae4d0bbe2785e6..2e602ab9dc4d440f075b9a28864a2e657d274f82 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -7,136 +7,130 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "frame.h"
 #endif
 
     #pragma implementation "frame.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/defs.h"
+

 #include "wx/frame.h"
 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"
 #include "wx/menu.h"
 #if wxUSE_TOOLBAR
 #include "wx/frame.h"
 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"
 #include "wx/menu.h"
 #if wxUSE_TOOLBAR

-#include "wx/toolbar.h"
+    #include "wx/toolbar.h"

 #endif
 #if wxUSE_STATUSBAR
 #endif
 #if wxUSE_STATUSBAR

-#include "wx/statusbr.h"
+    #include "wx/statusbr.h"

 #endif
 #include "wx/dcclient.h"
 
 #endif
 #include "wx/dcclient.h"
 

-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <glib.h>
+#include "wx/gtk/private.h"
+
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
+

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

-#include "gdk/gdkkeysyms.h"
-#include "gdk/gdkx.h"

 
 

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // constants
 // constants

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-const int wxMENU_HEIGHT    = 27;

 const int wxSTATUS_HEIGHT  = 25;
 const int wxPLACE_HOLDER   = 0;
 
 const int wxSTATUS_HEIGHT  = 25;
 const int wxPLACE_HOLDER   = 0;
 

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // idle system
 // idle system

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 
 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 

-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern wxList wxPendingDelete;
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------

 
 

-//-----------------------------------------------------------------------------
-// debug
-//-----------------------------------------------------------------------------
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)

 
 

-#ifdef __WXDEBUG__
+// ============================================================================
+// implementation
+// ============================================================================

 
 

-extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window );
+// ----------------------------------------------------------------------------
+// GTK callbacks
+// ----------------------------------------------------------------------------

 
 

-#endif
-
-//-----------------------------------------------------------------------------
-// "size_allocate"
-//-----------------------------------------------------------------------------
-
-static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
-{
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    if (!win->m_hasVMT) return;
-
-    if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
-    {
-        win->m_width = alloc->width;
-        win->m_height = alloc->height;
-        win->UpdateSize();
-    }
-}
-
-//-----------------------------------------------------------------------------
-// "delete_event"
-//-----------------------------------------------------------------------------
-
-static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win )
-{
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    win->Close();
-
-    return TRUE;
-}
+#if wxUSE_MENUS_NATIVE

 
 //-----------------------------------------------------------------------------
 // "child_attached" of menu bar
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "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;
 
 static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
     if (!win->m_hasVMT) return;
 

-    win->m_menuBarDetached = FALSE;
-    win->UpdateSize();
+    win->m_menuBarDetached = false;
+    win->GtkUpdateSize();
+}

 }
 
 //-----------------------------------------------------------------------------
 // "child_detached" of menu bar
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // "child_detached" of menu bar
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
 static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {

+    if (g_isIdle)
+        wxapp_install_idle_handler();
+

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

-    win->m_menuBarDetached = TRUE;
-    win->UpdateSize();
+    // 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
 //-----------------------------------------------------------------------------
 
 #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;
 
 static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
     if (!win->m_hasVMT) return;
 

-    win->m_toolBarDetached = FALSE;
-
-    win->UpdateSize();
+    win->m_toolBarDetached = false;
+    win->GtkUpdateSize();
+}

 }
 
 //-----------------------------------------------------------------------------
 // "child_detached" of tool bar
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // "child_detached" of tool bar
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
     if (g_isIdle)
 static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
     if (g_isIdle)


@@ -144,120 +138,19 @@ static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
 
     if (!win->m_hasVMT) return;
 
 
     if (!win->m_hasVMT) return;
 

-    win->m_toolBarDetached = TRUE;
-    win->UpdateSize();
-}
-#endif // wxUSE_TOOLBAR
+    // Raise the client area area
+    gdk_window_raise( win->m_wxwindow->window );

 
 

-//-----------------------------------------------------------------------------
-// "configure_event"
-//-----------------------------------------------------------------------------
-
-static gint 
-#if (GTK_MINOR_VERSON > 0)
-gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxFrame *win )
-#else
-gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
-#endif
-{
-    if (g_isIdle) 
-        wxapp_install_idle_handler();
-
-    if (!win->m_hasVMT) return FALSE;
-
-#if (GTK_MINOR_VERSON > 0)
-    int x = 0;
-    int y = 0;
-    gdk_window_get_root_origin( win->m_widget->window, &x, &y );
-    win->m_x = x;
-    win->m_y = y;
-#else
-    win->m_x = event->x;
-    win->m_y = event->y;
-#endif
-
-    wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
-    mevent.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( mevent );
-
-    return FALSE;
+    win->m_toolBarDetached = true;
+    win->GtkUpdateSize();

 }
 }

+}
+#endif // wxUSE_TOOLBAR

 
 

-//-----------------------------------------------------------------------------
-// "realize" from m_widget
-//-----------------------------------------------------------------------------
-
-/* we cannot MWM hints and icons before the widget has been realized,
-   so we do this directly after realization */
-
-static gint
-gtk_frame_realized_callback( GtkWidget *WXUNUSED(widget), wxFrame *win )
-{
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    /* all this is for Motif Window Manager "hints" and is supposed to be
-       recognized by other WM as well. not tested. */
-    long decor = (long) GDK_DECOR_BORDER;
-    long func = (long) GDK_FUNC_MOVE;
-
-    if ((win->GetWindowStyle() & wxCAPTION) != 0)
-        decor |= GDK_DECOR_TITLE;
-    if ((win->GetWindowStyle() & wxSYSTEM_MENU) != 0)
-    {
-       decor |= GDK_DECOR_MENU;
-       func |= GDK_FUNC_CLOSE;
-    }
-    if ((win->GetWindowStyle() & wxMINIMIZE_BOX) != 0)
-    {
-        func |= GDK_FUNC_MINIMIZE;
-        decor |= GDK_DECOR_MINIMIZE;
-    }
-    if ((win->GetWindowStyle() & wxMAXIMIZE_BOX) != 0)
-    {
-        func |= GDK_FUNC_MAXIMIZE;
-        decor |= GDK_DECOR_MAXIMIZE;
-    }
-    if ((win->GetWindowStyle() & wxRESIZE_BORDER) != 0)
-    {
-       func |= GDK_FUNC_RESIZE;
-       decor |= GDK_DECOR_RESIZEH;
-    }
-
-    gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor);
-    gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func);
-
-    /* GTK's shrinking/growing policy */
-    if ((win->GetWindowStyle() & wxRESIZE_BORDER) == 0)
-        gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1);
-    else
-        gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
-
-    /* reset the icon */
-    if (win->m_icon != wxNullIcon)
-    {
-        wxIcon icon( win->m_icon );
-        win->m_icon = wxNullIcon;
-        win->SetIcon( icon );
-    }
-
-    /* we set the focus to the child that accepts the focus. this
-       doesn't really have to be done in "realize" but why not? */
-    wxWindowList::Node *node = win->GetChildren().GetFirst();
-    while (node)
-    {
-        wxWindow *child = node->GetData();
-        if (child->AcceptsFocus())
-        {
-            child->SetFocus();
-            break;
-        }
-
-        node = node->GetNext();
-    }

 
 

-    return FALSE;
-}
+// ----------------------------------------------------------------------------
+// wxFrame itself
+// ----------------------------------------------------------------------------

 
 //-----------------------------------------------------------------------------
 // InsertChild for wxFrame
 
 //-----------------------------------------------------------------------------
 // InsertChild for wxFrame


@@ -265,27 +158,27 @@ gtk_frame_realized_callback( GtkWidget *WXUNUSED(widget), wxFrame *win )
 
 /* 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
 
 /* 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
+ * virtual function here as wxWidgets requires different ways to insert

  * a child in container classes. */
 
 static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
 {
     wxASSERT( GTK_IS_WIDGET(child->m_widget) );
  * a child in container classes. */
 
 static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
 {
     wxASSERT( GTK_IS_WIDGET(child->m_widget) );

-    
+

     if (!parent->m_insertInClientArea)
     {
     if (!parent->m_insertInClientArea)
     {

-        /* these are outside the client area */
+        // These are outside the client area

         wxFrame* frame = (wxFrame*) parent;
         wxFrame* frame = (wxFrame*) parent;

-        gtk_myfixed_put( GTK_MYFIXED(frame->m_mainWidget),
+        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 );
 
                          GTK_WIDGET(child->m_widget),
                          child->m_x,
                          child->m_y,
                          child->m_width,
                          child->m_height );
 

-#if wxUSE_TOOLBAR
-        /* we connect to these events for recalculating the client area
-           space when the toolbar is floating */
+#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 (wxIS_KIND_OF(child,wxToolBar))
         {
             wxToolBar *toolBar = (wxToolBar*) child;


@@ -302,8 +195,8 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
     }
     else
     {
     }
     else
     {

-        /* these are inside the client area */
-        gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
+        // 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,
                          GTK_WIDGET(child->m_widget),
                          child->m_x,
                          child->m_y,


@@ -311,358 +204,164 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
                          child->m_height );
     }
 
                          child->m_height );
     }
 

-    /* resize on OnInternalIdle */
-    parent->UpdateSize();
+    // Resize on OnInternalIdle
+    parent->GtkUpdateSize();

 }
 
 }
 

-//-----------------------------------------------------------------------------
-// wxFrame
-//-----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(wxFrame, wxWindow)
-    EVT_SIZE(wxFrame::OnSize)
-    EVT_CLOSE(wxFrame::OnCloseWindow)
-    EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
-END_EVENT_TABLE()
-
-IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
+// ----------------------------------------------------------------------------
+// wxFrame creation
+// ----------------------------------------------------------------------------

 
 void wxFrame::Init()
 {
 
 void wxFrame::Init()
 {

-    m_frameMenuBar = (wxMenuBar *) NULL;
-#if wxUSE_STATUSBAR
-    m_frameStatusBar = (wxStatusBar *) NULL;
-#endif // wxUSE_STATUSBAR
-#if wxUSE_TOOLBAR
-    m_frameToolBar = (wxToolBar *) NULL;
-#endif // wxUSE_TOOLBAR
-    m_sizeSet = FALSE;
-    m_miniEdge = 0;
-    m_miniTitle = 0;
-    m_mainWidget = (GtkWidget*) NULL;
-    m_menuBarDetached = FALSE;
-    m_toolBarDetached = FALSE;
-    m_insertInClientArea = TRUE;
-}
-
-wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
-{
-    Init();
-
-    Create( parent, id, title, pos, size, style, name );
+    m_menuBarDetached = false;
+    m_toolBarDetached = false;
+    m_menuBarHeight = 2;

 }
 
 }
 

-bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
+bool wxFrame::Create( wxWindow *parent,
+                      wxWindowID id,
+                      const wxString& title,
+                      const wxPoint& pos,
+                      const wxSize& sizeOrig,
+                      long style,
+                      const wxString &name )

 {
 {

-    wxTopLevelWindows.Append( this );
-
-    m_needParent = FALSE;
-
-    if (!PreCreation( parent, pos, size ) ||
-        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
-    {
-        wxFAIL_MSG( T("wxFrame creation failed") );
-       return FALSE;
-    }
-
-    m_title = title;
-
+    bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig,
+                                       style, name);

     m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame;
 
     m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame;
 

-    GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
-    if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP;
-
-    m_widget = gtk_window_new( win_type );
-
-    if (!name.IsEmpty())
-        gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() );
-
-#ifdef __WXDEBUG__
-    debug_focus_in( m_widget, T("wxFrame::m_widget"), name );
-#endif
-
-    gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );
-    GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
-
-    gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
-        GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );
-
-    /* m_mainWidget holds the toolbar, the menubar and the client area */
-    m_mainWidget = gtk_myfixed_new();
-    gtk_widget_show( m_mainWidget );
-    GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS );
-    gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );
-
-#ifdef __WXDEBUG__
-    debug_focus_in( m_mainWidget, T("wxFrame::m_mainWidget"), name );
-#endif
-
-    /* m_wxwindow only represents the client area without toolbar and menubar */
-    m_wxwindow = gtk_myfixed_new();
-    gtk_widget_show( m_wxwindow );
-    gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );
-
-#ifdef __WXDEBUG__
-    debug_focus_in( m_wxwindow, T("wxFrame::m_wxwindow"), name );
-#endif
-
-    /* we donm't allow the frame to get the focus as otherwise
-       the frame will grabit at arbitrary fcous changes. */
-    GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
-
-    if (m_parent) m_parent->AddChild( this );
-
-    PostCreation();
-
-    /*  we cannot set MWM hints and icons before the widget has
-        been realized, so we do this directly after realization */
-    gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
-                        GTK_SIGNAL_FUNC(gtk_frame_realized_callback), (gpointer) this );
-
-    /* the user resized the frame by dragging etc. */
-    gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
-        GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
-
-    /* the only way to get the window size is to connect to this event */
-    gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
-        GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this );
-
-    return TRUE;
+    return rt;

 }
 
 wxFrame::~wxFrame()
 {
 }
 
 wxFrame::~wxFrame()
 {

-    m_isBeingDeleted = TRUE;
-
-    if (m_frameMenuBar) delete m_frameMenuBar;
-    m_frameMenuBar = (wxMenuBar *) NULL;
-
-#if wxUSE_STATUSBAR
-    if (m_frameStatusBar) delete m_frameStatusBar;
-    m_frameStatusBar = (wxStatusBar *) NULL;
-#endif // wxUSE_STATUSBAR
-
-#if wxUSE_TOOLBAR
-    if (m_frameToolBar) delete m_frameToolBar;
-    m_frameToolBar = (wxToolBar *) NULL;
-#endif // wxUSE_TOOLBAR
-
-    wxTopLevelWindows.DeleteObject( this );
-
-    if (wxTheApp->GetTopWindow() == this)
-        wxTheApp->SetTopWindow( (wxWindow*) NULL );
-
-    if (wxTopLevelWindows.Number() == 0)
-        wxTheApp->ExitMainLoop();
-}
-
-bool wxFrame::Show( bool show )
-{
-    wxASSERT_MSG( (m_widget != NULL), T("invalid frame") );
-
-    if (show && !m_sizeSet)
-    {
-        /* by calling GtkOnSize here, we don't have to call
-           either after showing the frame, which would entail
-           much ugly flicker or from within the size_allocate
-           handler, because GTK 1.1.X forbids that. */
-
-        GtkOnSize( m_x, m_y, m_width, m_height );
-    }
-
-    return wxWindow::Show( show );
-}
-
-bool wxFrame::Destroy()
-{
-    wxASSERT_MSG( (m_widget != NULL), T("invalid frame") );
-
-    if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
-
-    return TRUE;
-}
-
-void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
-{
-    wxASSERT_MSG( (m_widget != NULL), T("invalid frame") );
-
-    /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */
-    wxASSERT_MSG( (m_wxwindow != NULL), T("invalid frame") );
-
-    /* avoid recursions */
-    if (m_resizing) return;
-    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_ALLOW_MINUS_ONE) == 0)
-    {
-        if (x != -1) m_x = x;
-        if (y != -1) m_y = y;
-        if (width != -1) m_width = width;
-        if (height != -1) m_height = height;
-    }
-    else
-    {
-        m_x = x;
-        m_y = y;
-        m_width = width;
-        m_height = height;
-    }
-
-    if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
-    {
-        if (width == -1) m_width = 80;
-    }
-
-    if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT)
-    {
-       if (height == -1) m_height = 26;
-    }
-
-    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;
-
-    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))
-    {
-        /* we set the size in GtkOnSize, i.e. mostly the actual resizing is
-           done either directly before the frame is shown or in idle time
-           so that different calls to SetSize() don't lead to flicker. */
-        m_sizeSet = FALSE;
-    }
-
-    m_resizing = FALSE;
+    m_isBeingDeleted = true;
+    DeleteAllBars();

 }
 
 }
 

-void wxFrame::Centre( int direction )
-{
-    wxASSERT_MSG( (m_widget != NULL), T("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 );
-}
+// ----------------------------------------------------------------------------
+// overridden wxWindow methods
+// ----------------------------------------------------------------------------

 
 void wxFrame::DoGetClientSize( int *width, int *height ) const
 {
 
 void wxFrame::DoGetClientSize( int *width, int *height ) const
 {

-    wxASSERT_MSG( (m_widget != NULL), T("invalid frame") );
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+
+    wxTopLevelWindow::DoGetClientSize( width, height );

 
 

-    wxWindow::DoGetClientSize( width, height );

     if (height)
     {
     if (height)
     {

-        /* menu bar */
+#if wxUSE_MENUS_NATIVE
+        // menu bar

         if (m_frameMenuBar)
         {
             if (!m_menuBarDetached)
         if (m_frameMenuBar)
         {
             if (!m_menuBarDetached)

-                (*height) -= wxMENU_HEIGHT;
+                (*height) -= m_menuBarHeight;

             else
                 (*height) -= wxPLACE_HOLDER;
         }
             else
                 (*height) -= wxPLACE_HOLDER;
         }

+#endif // wxUSE_MENUS_NATIVE

 
 #if wxUSE_STATUSBAR
 
 #if wxUSE_STATUSBAR

-        /* status bar */
-        if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
-#endif
+        // status bar
+        if (m_frameStatusBar && m_frameStatusBar->IsShown())
+            (*height) -= wxSTATUS_HEIGHT;
+#endif // wxUSE_STATUSBAR

 
 #if wxUSE_TOOLBAR
 
 #if wxUSE_TOOLBAR

-        /* tool bar */
-        if (m_frameToolBar)
+        // tool bar
+        if (m_frameToolBar && m_frameToolBar->IsShown())

         {
         {

-            if (!m_toolBarDetached)
+            if (m_toolBarDetached)

             {
             {

-                int y = 0;
-                m_frameToolBar->GetSize( (int *) NULL, &y );
-                (*height) -= y;
+                *height -= wxPLACE_HOLDER;

             }
             else
             }
             else

-                (*height) -= wxPLACE_HOLDER;
+            {
+                int x, y;
+                m_frameToolBar->GetSize( &x, &y );
+                if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
+                {
+                    *width -= x;
+                }
+                else
+                {
+                    *height -= y;
+                }
+            }

         }
         }

-#endif
-
-        /* mini edge */
-        (*height) -= m_miniEdge*2 + m_miniTitle;
-    }
-    if (width)
-    {
-        (*width) -= m_miniEdge*2;
+#endif // wxUSE_TOOLBAR

     }
 }
 
 void wxFrame::DoSetClientSize( int width, int height )
 {
     }
 }
 
 void wxFrame::DoSetClientSize( int width, int height )
 {

-    wxASSERT_MSG( (m_widget != NULL), T("invalid frame") );
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

 
 

-        /* menu bar */
+#if wxUSE_MENUS_NATIVE
+        // menu bar

         if (m_frameMenuBar)
         {
             if (!m_menuBarDetached)
         if (m_frameMenuBar)
         {
             if (!m_menuBarDetached)

-                height += wxMENU_HEIGHT;
+                height += m_menuBarHeight;

             else
                 height += wxPLACE_HOLDER;
         }
             else
                 height += wxPLACE_HOLDER;
         }

+#endif // wxUSE_MENUS_NATIVE

 
 #if wxUSE_STATUSBAR
 
 #if wxUSE_STATUSBAR

-        /* status bar */
-        if (m_frameStatusBar) height += wxSTATUS_HEIGHT;
+        // status bar
+        if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT;

 #endif
 
 #if wxUSE_TOOLBAR
 #endif
 
 #if wxUSE_TOOLBAR

-        /* tool bar */
-        if (m_frameToolBar)
+        // tool bar
+        if (m_frameToolBar && m_frameToolBar->IsShown())

         {
         {

-            if (!m_toolBarDetached)
+            if (m_toolBarDetached)

             {
             {

-                int y = 0;
-                m_frameToolBar->GetSize( (int *) NULL, &y );
-                height += y;
+                height += wxPLACE_HOLDER;

             }
             else
             }
             else

-                height += wxPLACE_HOLDER;
+            {
+                int x, y;
+                m_frameToolBar->GetSize( &x, &y );
+                if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
+                {
+                    width += x;
+                }
+                else
+                {
+                    height += y;
+                }
+            }

         }
 #endif
 
         }
 #endif
 

-    wxWindow::DoSetClientSize( width + m_miniEdge*2, height  + m_miniEdge*2 + m_miniTitle );
+    wxTopLevelWindow::DoSetClientSize( width, height );

 }
 
 }
 

-void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
+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;
 
 {
     // due to a bug in gtk, x,y are always 0
     // m_x = x;
     // m_y = y;
 

-    /* avoid recursions */
+    // avoid recursions

     if (m_resizing) return;
     if (m_resizing) return;

-    m_resizing = TRUE;
+    m_resizing = true;

 
 

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

 
     m_width = width;
     m_height = height;
 
 
     m_width = width;
     m_height = height;
 

-    /* space occupied by m_frameToolBar and m_frameMenuBar */
-    int client_area_y_offset = 0;
+    // 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
 
     /* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses
        wxWindow::Create to create it's GTK equivalent. m_mainWidget is only


@@ -671,79 +370,117 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
        skip the part which handles m_frameMenuBar, m_frameToolBar and (most
        importantly) m_mainWidget */
 
        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 (m_mainWidget)
     {

-        /* check if size is in legal range */
-        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;
-
-        /* 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. */
-
+        // set size hints
+        gint flag = 0; // GDK_HINT_POS;
+        if ((minWidth != -1) || (minHeight != -1)) flag |= GDK_HINT_MIN_SIZE;
+        if ((maxWidth != -1) || (maxHeight != -1)) flag |= GDK_HINT_MAX_SIZE;
+        GdkGeometry geom;
+        geom.min_width = minWidth;
+        geom.min_height = minHeight;
+        geom.max_width = maxWidth;
+        geom.max_height = maxHeight;
+        gtk_window_set_geometry_hints( GTK_WINDOW(m_widget),
+                                       (GtkWidget*) NULL,
+                                       &geom,
+                                       (GdkWindowHints) flag );
+
+        // I revert back to wxGTK's original behaviour. m_mainWidget holds
+        // the menubar, the toolbar and the client area, which is represented
+        // by m_wxwindow.
+        // This hurts in the eye, but I don't want to call SetSize()
+        // because I don't want to call any non-native functions here.
+
+#if wxUSE_MENUS_NATIVE

         if (m_frameMenuBar)
         {
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
             int ww = m_width  - 2*m_miniEdge;
         if (m_frameMenuBar)
         {
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
             int ww = m_width  - 2*m_miniEdge;

-            int hh = wxMENU_HEIGHT;
+            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;
             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_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
+            gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),

                                   m_frameMenuBar->m_widget,
                                   xx, yy, ww, hh );
             client_area_y_offset += hh;
         }
                                   m_frameMenuBar->m_widget,
                                   xx, yy, ww, hh );
             client_area_y_offset += hh;
         }

+#endif // wxUSE_MENUS_NATIVE

 
 #if wxUSE_TOOLBAR
 
 #if wxUSE_TOOLBAR

-        if (m_frameToolBar)
+        if ((m_frameToolBar) && m_frameToolBar->IsShown() &&
+            (m_frameToolBar->m_widget->parent == m_mainWidget))

         {
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
         {
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;

+#if wxUSE_MENUS_NATIVE

             if (m_frameMenuBar)
             {
                 if (!m_menuBarDetached)
             if (m_frameMenuBar)
             {
                 if (!m_menuBarDetached)

-                    yy += wxMENU_HEIGHT;
+                    yy += m_menuBarHeight;

                 else
                     yy += wxPLACE_HOLDER;
             }
                 else
                     yy += wxPLACE_HOLDER;
             }

-            int ww = m_width - 2*m_miniEdge;
-            int hh = m_frameToolBar->m_height;
-           if (m_toolBarDetached) hh = wxPLACE_HOLDER;
+#endif // wxUSE_MENUS_NATIVE
+

             m_frameToolBar->m_x = xx;
             m_frameToolBar->m_y = yy;
             m_frameToolBar->m_x = xx;
             m_frameToolBar->m_y = yy;

-            /* m_frameToolBar->m_height = hh;   don't change the toolbar's height */
-            m_frameToolBar->m_width = ww;
-            gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
+
+            // 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 );
                                   m_frameToolBar->m_widget,
                                   xx, yy, ww, hh );

-            client_area_y_offset += hh;

         }
         }

-#endif
+#endif // wxUSE_TOOLBAR

 
 

-        int client_x = m_miniEdge;
+        int client_x = client_area_x_offset + m_miniEdge;

         int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;
         int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;

-        int client_w = m_width - 2*m_miniEdge;
+        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;
         int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;

-        gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
+        gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),

                               m_wxwindow,
                               client_x, client_y, client_w, client_h );
     }
     else
     {
                               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 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 wxUSE_STATUSBAR

-    if (m_frameStatusBar)
+    if (m_frameStatusBar && m_frameStatusBar->IsShown())

     {
         int xx = 0 + m_miniEdge;
         int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset;
     {
         int xx = 0 + m_miniEdge;
         int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset;


@@ -753,324 +490,228 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         m_frameStatusBar->m_y = yy;
         m_frameStatusBar->m_width = ww;
         m_frameStatusBar->m_height = hh;
         m_frameStatusBar->m_y = yy;
         m_frameStatusBar->m_width = ww;
         m_frameStatusBar->m_height = hh;

-        gtk_myfixed_set_size( GTK_MYFIXED(m_wxwindow),
-                              m_frameStatusBar->m_widget,
-                              xx, yy, ww, 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
-
-    /* we actually set the size of a frame here and no-where else */
-    gtk_widget_set_usize( m_widget, m_width, m_height );
+#endif // wxUSE_STATUSBAR

 
 

-    m_sizeSet = TRUE;
+    m_sizeSet = true;

 
 

-    /* send size event to frame */
+    // send size event to frame

     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
 
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
 

-    /* send size event to status bar */
+#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 );
     }
     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::MakeModal( bool modal )
-{
-    if (modal)
-        gtk_grab_add( m_widget );
-    else
-        gtk_grab_remove( m_widget );
+    m_resizing = false;

 }
 
 void wxFrame::OnInternalIdle()
 {
 }
 
 void wxFrame::OnInternalIdle()
 {

-    if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
-        GtkOnSize( m_x, m_y, m_width, m_height );
-
-    DoMenuUpdates();
+    wxFrameBase::OnInternalIdle();

 
 

+#if wxUSE_MENUS_NATIVE

     if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle();
     if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle();

+#endif // wxUSE_MENUS_NATIVE

 #if wxUSE_TOOLBAR
     if (m_frameToolBar) m_frameToolBar->OnInternalIdle();
 #endif
 #if wxUSE_STATUSBAR
 #if wxUSE_TOOLBAR
     if (m_frameToolBar) m_frameToolBar->OnInternalIdle();
 #endif
 #if wxUSE_STATUSBAR

-    if (m_frameStatusBar) m_frameStatusBar->OnInternalIdle();
-#endif
+    if (m_frameStatusBar)
+    {
+        m_frameStatusBar->OnInternalIdle();

 
 

-    wxWindow::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

 }
 
 }
 

-void wxFrame::OnCloseWindow( wxCloseEvent& WXUNUSED(event) )
-{
-    Destroy();
-}
+// ----------------------------------------------------------------------------
+// menu/tool/status bar stuff
+// ----------------------------------------------------------------------------

 
 

-void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
+#if wxUSE_MENUS_NATIVE
+
+void wxFrame::DetachMenuBar()

 {
 {

-    wxASSERT_MSG( (m_widget != NULL), T("invalid frame") );
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+    wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );

 
 

-#if wxUSE_CONSTRAINTS
-    if (GetAutoLayout())
+    if ( m_frameMenuBar )

     {
     {

-        Layout();
-    }
-    else
-#endif // wxUSE_CONSTRAINTS
-    {
-        /* do we have exactly one child? */
-        wxWindow *child = (wxWindow *)NULL;
-        for ( wxNode *node = GetChildren().First(); node; node = node->Next() )
+        m_frameMenuBar->UnsetInvokingWindow( this );
+
+        if (m_frameMenuBar->GetWindowStyle() & wxMB_DOCKABLE)

         {
         {

-            wxWindow *win = (wxWindow *)node->Data();
-            if ( !wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog) )
-            {
-                if (child)
-                {
-                    /* it's the second one: do nothing */
-                    return;
-                }
+            gtk_signal_disconnect_by_func( GTK_OBJECT(m_frameMenuBar->m_widget),
+                GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this );

 
 

-                child = win;
-            }
+            gtk_signal_disconnect_by_func( GTK_OBJECT(m_frameMenuBar->m_widget),
+                GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );

         }
 
         }
 

-        /* no children at all? */
-        if (child)
-        {
-            /* yes: set it's size to fill all the frame */
-            int client_x, client_y;
-            DoGetClientSize( &client_x, &client_y );
-            child->SetSize( 1, 1, client_x-2, client_y-2 );
-        }
+        gtk_widget_ref( m_frameMenuBar->m_widget );
+
+        gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );

     }
     }

+
+    wxFrameBase::DetachMenuBar();

 }
 
 }
 

-void wxFrame::SetMenuBar( wxMenuBar *menuBar )
+void wxFrame::AttachMenuBar( wxMenuBar *menuBar )

 {
 {

-    wxASSERT_MSG( (m_widget != NULL), T("invalid frame") );
-    wxASSERT_MSG( (m_wxwindow != NULL), T("invalid frame") );
-
-    m_frameMenuBar = menuBar;
+    wxFrameBase::AttachMenuBar(menuBar);

 
     if (m_frameMenuBar)
     {
         m_frameMenuBar->SetInvokingWindow( this );
 
 
     if (m_frameMenuBar)
     {
         m_frameMenuBar->SetInvokingWindow( this );
 

-        if (m_frameMenuBar->GetParent() != this)
-        {
-            m_frameMenuBar->SetParent(this);
-            gtk_myfixed_put( GTK_MYFIXED(m_mainWidget),
+        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 );
 
                 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 );
+        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 );
+            gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached",
+                GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );

         }
         }

-    }
-
-    /* resize window in OnInternalIdle */
-    m_sizeSet = FALSE;
-}

 
 

-wxMenuBar *wxFrame::GetMenuBar() const
-{
-    return m_frameMenuBar;
-}
+        gtk_widget_show( m_frameMenuBar->m_widget );

 
 

-void wxFrame::OnMenuHighlight(wxMenuEvent& event)
-{
-#if wxUSE_STATUSBAR
-    if (GetStatusBar())
+        UpdateMenuBarSize();
+    }
+    else

     {
     {

-        // if no help string found, we will clear the status bar text
-        wxString helpString;
-
-        int menuId = event.GetMenuId();
-        if ( menuId != -1 )
-        {
-            wxMenuBar *menuBar = GetMenuBar();
-            if (menuBar)
-            {
-                helpString = menuBar->GetHelpString(menuId);
-            }
-        }
-
-        SetStatusText(helpString);
+        m_menuBarHeight = 2;
+        GtkUpdateSize();        // resize window in OnInternalIdle

     }
     }

-#endif // wxUSE_STATUSBAR

 }
 
 }
 

-#if wxUSE_TOOLBAR
-wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& name )
+void wxFrame::UpdateMenuBarSize()

 {
 {

-    wxASSERT_MSG( (m_widget != NULL), T("invalid frame") );
-
-    wxCHECK_MSG( m_frameToolBar == NULL, FALSE, T("recreating toolbar in wxFrame") );
+    GtkRequisition  req;

 
 

-    m_insertInClientArea = FALSE;
+    req.width = 2;
+    req.height = 2;

 
 

-    m_frameToolBar = OnCreateToolBar( style, id, name );
+    // this is called after Remove with a NULL m_frameMenuBar
+    if ( m_frameMenuBar )
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_frameMenuBar->m_widget) )->size_request )
+        (m_frameMenuBar->m_widget, &req );

 
 

-    if (m_frameToolBar) GetChildren().DeleteObject( m_frameToolBar );
+    m_menuBarHeight = req.height;

 
 

-    m_insertInClientArea = TRUE;
+        // resize window in OnInternalIdle

 
 

-    m_sizeSet = FALSE;
-
-    return m_frameToolBar;
-}
-
-wxToolBar* wxFrame::OnCreateToolBar( long style, wxWindowID id, const wxString& name )
-{
-    return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name );
+    GtkUpdateSize();

 }
 
 }
 

-wxToolBar *wxFrame::GetToolBar() const
-{
-    return m_frameToolBar;
-}
-#endif // wxUSE_TOOLBAR
-
-#if wxUSE_STATUSBAR
-wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
-{
-    wxASSERT_MSG( (m_widget != NULL), T("invalid frame") );
-
-    wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, T("recreating status bar in wxFrame") );
+#endif // wxUSE_MENUS_NATIVE

 
 

-    m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
-
-    m_sizeSet = FALSE;
-
-    return m_frameStatusBar;
-}
+#if wxUSE_TOOLBAR

 
 

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

 {
 {

-    wxStatusBar *statusBar = (wxStatusBar *) NULL;
-
-    statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20), style, name);
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

 
 

-    // Set the height according to the font and the border size
-    wxClientDC dc(statusBar);
-    dc.SetFont( statusBar->GetFont() );
+    m_insertInClientArea = false;

 
 

-    long x, y;
-    dc.GetTextExtent( "X", &x, &y );
+    m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name );

 
 

-    int height = (int)( (y  * 1.1) + 2* statusBar->GetBorderY());
+    m_insertInClientArea = true;

 
 

-    statusBar->SetSize( -1, -1, 100, height );
-
-    statusBar->SetFieldsCount( number );
-    return statusBar;
-}
+    GtkUpdateSize();

 
 

-wxStatusBar *wxFrame::GetStatusBar() const
-{
-    return m_frameStatusBar;
-}
-
-void wxFrame::SetStatusText(const wxString& text, int number)
-{
-    wxASSERT_MSG( (m_widget != NULL), T("invalid frame") );
-
-    wxCHECK_RET( m_frameStatusBar != NULL, T("no statusbar to set text for") );
-
-    m_frameStatusBar->SetStatusText(text, number);
+    return m_frameToolBar;

 }
 
 }
 

-void wxFrame::SetStatusWidths(int n, const int widths_field[] )
+void wxFrame::SetToolBar(wxToolBar *toolbar)

 {
 {

-    wxASSERT_MSG( (m_widget != NULL), T("invalid frame") );
-
-    wxCHECK_RET( m_frameStatusBar != NULL, T("no statusbar to set widths for") );
-
-    m_frameStatusBar->SetStatusWidths(n, widths_field);
-}
-#endif // wxUSE_STATUSBAR
+    bool hadTbar = m_frameToolBar != NULL;

 
 

-void wxFrame::Command( int id )
-{
-    wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
-    commandEvent.SetInt( id );
-    commandEvent.SetEventObject( this );
+    wxFrameBase::SetToolBar(toolbar);

 
 

-    wxMenuBar *bar = GetMenuBar();
-    if (!bar) return;
+    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 );

 
 

-    wxMenuItem *item = bar->FindItemForId(id) ;
-    if (item && item->IsCheckable())
+            gtk_widget_reparent( m_frameToolBar->m_widget, m_mainWidget );
+            GtkUpdateSize();
+        }
+    }
+    else // toolbar unset

     {
     {

-        bar->Check(id,!bar->Checked(id)) ;
+        // still need to update size if it had been there before
+        if ( hadTbar )
+        {
+            GtkUpdateSize();
+        }

     }
     }

-
-    wxEvtHandler* evtHandler = GetEventHandler();
-
-    evtHandler->ProcessEvent(commandEvent);

 }
 
 }
 

-void wxFrame::SetTitle( const wxString &title )
-{
-    wxASSERT_MSG( (m_widget != NULL), T("invalid frame") );
+#endif // wxUSE_TOOLBAR

 
 

-    m_title = title;
-    if (m_title.IsNull()) m_title = T("");
-    gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );
-}
+#if wxUSE_STATUSBAR

 
 

-void wxFrame::SetIcon( const wxIcon &icon )
+wxStatusBar* wxFrame::CreateStatusBar(int number,
+                                      long style,
+                                      wxWindowID id,
+                                      const wxString& name)

 {
 {

-    wxASSERT_MSG( (m_widget != NULL), T("invalid frame") );
-
-    m_icon = icon;
-    if (!icon.Ok()) return;
-
-    if (!m_widget->window) return;
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

 
 

-    wxMask *mask = icon.GetMask();
-    GdkBitmap *bm = (GdkBitmap *) NULL;
-    if (mask) bm = mask->GetBitmap();
+    // because it will change when toolbar is added
+    GtkUpdateSize();

 
 

-    gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
+    return wxFrameBase::CreateStatusBar( number, style, id, name );

 }
 
 }
 

-void wxFrame::Maximize(bool WXUNUSED(maximize)) 
+void wxFrame::SetStatusBar(wxStatusBar *statbar)

 {
 {

+    bool hadStatBar = m_frameStatusBar != NULL;
+
+    wxFrameBase::SetStatusBar(statbar);
+
+    if (hadStatBar && !m_frameStatusBar)
+        GtkUpdateSize();

 }
 
 }
 

-void wxFrame::Restore() 
+void wxFrame::PositionStatusBar()

 {
 {

-}
+    if ( !m_frameStatusBar )
+        return;

 
 

-void wxFrame::Iconize( bool iconize ) 
-{ 
-   if (iconize)
-   {
-        XIconifyWindow( GDK_WINDOW_XDISPLAY( m_widget->window ),
-                       GDK_WINDOW_XWINDOW( m_widget->window ),
-                       DefaultScreen( GDK_DISPLAY() ) );
-   }
+    GtkUpdateSize();

 }
 }

+#endif // wxUSE_STATUSBAR

 
 

-bool wxFrame::IsIconized() const 
-{ 
-    return FALSE; 
-}