fixed broken wxCtime() implementation (wrong buffer size count, wrong conversion)

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 65ac5783e4a3580f6e1b48c36df5b9d1e7cfe0fa..1bf86a39a5f9f74d21efbb6114c526787b27de2e 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -15,16 +15,16 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

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

-#ifdef __VMS
-#define XIconifyWindow XICONIFYWINDOW
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

+#include "wx/frame.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"


@@ -38,8 +38,8 @@
 #include "wx/dcclient.h"
 
 #include <glib.h>
 #include "wx/dcclient.h"
 
 #include <glib.h>

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

 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 


@@ -49,7 +49,6 @@
 // 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;
 


@@ -65,28 +64,7 @@ extern int g_openDialogs;
 // event tables
 // ----------------------------------------------------------------------------
 
 // event tables
 // ----------------------------------------------------------------------------
 

-#ifdef __WXUNIVERSAL__
-    IMPLEMENT_DYNAMIC_CLASS(wxFrameGTK, wxWindow)
-#else
-    IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameGTK)
-    IMPLEMENT_DYNAMIC_CLASS(wxFrameGTK, wxWindow)
-#endif
-
-// ----------------------------------------------------------------------------
-// data
-// ----------------------------------------------------------------------------
-
-extern wxList wxPendingDelete;
-
-// ----------------------------------------------------------------------------
-// debug
-// ----------------------------------------------------------------------------
-
-#ifdef __WXDEBUG__
-
-extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window );
-
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -96,323 +74,112 @@ extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar
 // GTK callbacks
 // ----------------------------------------------------------------------------
 
 // GTK callbacks
 // ----------------------------------------------------------------------------
 

-//-----------------------------------------------------------------------------
-// "focus" from m_window
-//-----------------------------------------------------------------------------
-
-static gint gtk_frame_focus_callback( GtkWidget *widget, GtkDirectionType WXUNUSED(d), wxWindow *WXUNUSED(win) )
-{
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    // This disables GTK's tab traversal
-    gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus" );
-    return TRUE;
-}
-
-//-----------------------------------------------------------------------------
-// "size_allocate"
-//-----------------------------------------------------------------------------
-
-static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrameGTK *win )
-{
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    if (!win->m_hasVMT)
-        return;
-
-    if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
-    {
-/*
-        wxPrintf( "OnSize from " );
-        if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-           wxPrintf( win->GetClassInfo()->GetClassName() );
-        wxPrintf( " %d %d %d %d\n", (int)alloc->x,
-                                (int)alloc->y,
-                                (int)alloc->width,
-                                (int)alloc->height );
-*/
-
-        win->m_width = alloc->width;
-        win->m_height = alloc->height;
-        win->m_queuedFullRedraw = TRUE;
-        win->GtkUpdateSize();
-    }
-}
-
-//-----------------------------------------------------------------------------
-// "delete_event"
-//-----------------------------------------------------------------------------
-
-static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrameGTK *win )
-{
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    if ((g_openDialogs == 0) && (win->IsEnabled()))
-        win->Close();
-
-    return TRUE;
-}
+#if wxUSE_MENUS_NATIVE

 
 

-#if wxUSE_MENUS

 //-----------------------------------------------------------------------------
 // "child_attached" of menu bar
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // "child_attached" of menu bar
 //-----------------------------------------------------------------------------
 

-static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrameGTK *win )
+extern "C" {
+static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )

 {
     if (!win->m_hasVMT) return;
 
     win->m_menuBarDetached = FALSE;
     win->GtkUpdateSize();
 }
 {
     if (!win->m_hasVMT) return;
 
     win->m_menuBarDetached = FALSE;
     win->GtkUpdateSize();
 }

+}

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

-static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrameGTK *win )
+extern "C" {
+static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )

 {
 {

+    if (g_isIdle)
+        wxapp_install_idle_handler();
+

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

+    // Raise the client area area
+    gdk_window_raise( win->m_wxwindow->window );
+

     win->m_menuBarDetached = TRUE;
     win->GtkUpdateSize();
 }
     win->m_menuBarDetached = TRUE;
     win->GtkUpdateSize();
 }

-#endif // wxUSE_MENUS
+}
+
+#endif // wxUSE_MENUS_NATIVE

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

-static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrameGTK *win )
+extern "C" {
+static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )

 {
     if (!win->m_hasVMT) return;
 
     win->m_toolBarDetached = FALSE;
 {
     if (!win->m_hasVMT) return;
 
     win->m_toolBarDetached = FALSE;

-

     win->GtkUpdateSize();
 }
     win->GtkUpdateSize();
 }

+}

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

-static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrameGTK *win )
+extern "C" {
+static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )

 {
     if (g_isIdle)
         wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return;
 
 {
     if (g_isIdle)
         wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return;
 

+    // Raise the client area area
+    gdk_window_raise( win->m_wxwindow->window );
+

     win->m_toolBarDetached = TRUE;
     win->GtkUpdateSize();
 }
     win->m_toolBarDetached = TRUE;
     win->GtkUpdateSize();
 }

-#endif // wxUSE_TOOLBAR
-
-//-----------------------------------------------------------------------------
-// "configure_event"
-//-----------------------------------------------------------------------------
-
-static gint
-#if (GTK_MINOR_VERSION > 0)
-gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxFrameGTK *win )
-#else
-gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrameGTK *win )
-#endif
-{
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    if (!win->m_hasVMT)
-        return FALSE;
-
-#if (GTK_MINOR_VERSION > 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;
-}
-
-//-----------------------------------------------------------------------------
-// "realize" from m_widget
-//-----------------------------------------------------------------------------
-
-/* we cannot MWM hints and icons before the widget has been realized,
-   so we do this directly after realization */
-
-static void
-gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget), wxFrameGTK *win )
-{
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    if ((win->m_miniEdge > 0) || (win->HasFlag(wxSIMPLE_BORDER)) || (win->HasFlag(wxNO_BORDER)))
-    {
-        /* This is a mini-frame or a borderless frame. */
-        gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)0 );
-        gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)0 );
-    }
-    else
-    {
-        /* 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 */
-    wxIcon iconOld = win->GetIcon();
-    if ( iconOld != wxNullIcon )
-    {
-        wxIcon icon( iconOld );
-        win->SetIcon( 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();
-    }
-}
-
-//-----------------------------------------------------------------------------
-// "map_event" from m_widget
-//-----------------------------------------------------------------------------
-
-static void
-gtk_frame_map_callback( GtkWidget * WXUNUSED(widget),
-                        GdkEvent * WXUNUSED(event),
-                        wxFrame *win )
-{
-    win->SetIconizeState(FALSE);
-}
-
-//-----------------------------------------------------------------------------
-// "unmap_event" from m_widget
-//-----------------------------------------------------------------------------
-
-static void
-gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget),
-                          GdkEvent * WXUNUSED(event),
-                          wxFrame *win )
-{
-    win->SetIconizeState(TRUE);
-}
-
-//-----------------------------------------------------------------------------
-// "expose_event" of m_client
-//-----------------------------------------------------------------------------
-
-static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxWindow *win )
-{
-    GtkPizza *pizza = GTK_PIZZA(widget);
-
-    gtk_paint_flat_box (win->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL,
-                GTK_SHADOW_NONE, &gdk_event->area, win->m_widget, "base", 0, 0, -1, -1);
-
-    return TRUE;

 }
 }

+#endif // wxUSE_TOOLBAR

 
 

-//-----------------------------------------------------------------------------
-// "draw" of m_client
-//-----------------------------------------------------------------------------
-
-
-static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxWindow *win )
-{
-    GtkPizza *pizza = GTK_PIZZA(widget);
-
-    gtk_paint_flat_box (win->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL,
-                GTK_SHADOW_NONE, rect, win->m_widget, "base", 0, 0, -1, -1);
-}

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

-// wxFrameGTK itself
+// wxFrame itself

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

-// InsertChild for wxFrameGTK
+// InsertChild for wxFrame

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

-/* Callback for wxFrameGTK. This very strange beast has to be used because
+/* 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
  * 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. */
 
  * a child in container classes. */
 

-static void wxInsertChildInFrame( wxFrameGTK* parent, wxWindow* child )
+static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )

 {
     wxASSERT( GTK_IS_WIDGET(child->m_widget) );
 
     if (!parent->m_insertInClientArea)
     {
 {
     wxASSERT( GTK_IS_WIDGET(child->m_widget) );
 
     if (!parent->m_insertInClientArea)
     {

-        /* these are outside the client area */
-        wxFrameGTK* frame = (wxFrameGTK*) parent;
+        // 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 );
         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
 #if wxUSE_TOOLBAR_NATIVE

-        /* we connect to these events for recalculating the client area
-           space when the toolbar is floating */
+        // 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;


@@ -429,7 +196,7 @@ static void wxInsertChildInFrame( wxFrameGTK* parent, wxWindow* child )
     }
     else
     {
     }
     else
     {

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

         gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
                          GTK_WIDGET(child->m_widget),
                          child->m_x,
         gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
                          GTK_WIDGET(child->m_widget),
                          child->m_x,


@@ -437,31 +204,23 @@ static void wxInsertChildInFrame( wxFrameGTK* parent, wxWindow* child )
                          child->m_width,
                          child->m_height );
     }
                          child->m_width,
                          child->m_height );
     }

-
-    /* resize on OnInternalIdle */
+    
+    // Resize on OnInternalIdle

     parent->GtkUpdateSize();
 }
 
 // ----------------------------------------------------------------------------
     parent->GtkUpdateSize();
 }
 
 // ----------------------------------------------------------------------------

-// wxFrameGTK creation
+// wxFrame creation

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

-void wxFrameGTK::Init()
+void wxFrame::Init()

 {
 {

-    m_sizeSet = FALSE;
-    m_miniEdge = 0;
-    m_miniTitle = 0;
-    m_mainWidget = (GtkWidget*) NULL;

     m_menuBarDetached = FALSE;
     m_toolBarDetached = FALSE;
     m_menuBarDetached = FALSE;
     m_toolBarDetached = FALSE;

-    m_insertInClientArea = TRUE;
-    m_isFrame = TRUE;
-    m_isIconized = FALSE;
-    m_fsIsShowing = FALSE;
-    m_themeEnabled = TRUE;
+    m_menuBarHeight = 2;

 }
 
 }
 

-bool wxFrameGTK::Create( wxWindow *parent,
+bool wxFrame::Create( wxWindow *parent,

                       wxWindowID id,
                       const wxString& title,
                       const wxPoint& pos,
                       wxWindowID id,
                       const wxString& title,
                       const wxPoint& pos,


@@ -469,305 +228,50 @@ bool wxFrameGTK::Create( wxWindow *parent,
                       long style,
                       const wxString &name )
 {
                       long style,
                       const wxString &name )
 {

-    // always create a frame of some reasonable, even if arbitrary, size (at
-    // least for MSW compatibility)
-    wxSize size = sizeOrig;
-    if ( size.x == -1 || size.y == -1 )
-    {
-        wxSize sizeDpy = wxGetDisplaySize();
-        if ( size.x == -1 )
-            size.x = sizeDpy.x / 3;
-        if ( size.y == -1 )
-            size.y = sizeDpy.y / 5;
-    }
-
-    wxTopLevelWindows.Append( this );
-
-    m_needParent = FALSE;
-
-    if (!PreCreation( parent, pos, size ) ||
-        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
-    {
-        wxFAIL_MSG( wxT("wxFrameGTK 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 & wxFRAME_TOOL_WINDOW)
-        win_type = GTK_WINDOW_POPUP;
-
-    m_widget = gtk_window_new( win_type );
-
-    if ((m_parent) && (HasFlag(wxFRAME_FLOAT_ON_PARENT)) && (GTK_IS_WINDOW(m_parent->m_widget)))
-        gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
-
-    if (!name.IsEmpty())
-        gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() );
-
-#ifdef __WXDEBUG__
-    debug_focus_in( m_widget, wxT("wxFrameGTK::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_pizza_new();
-    gtk_widget_show( m_mainWidget );
-    GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS );
-    gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );
-
-    /* for m_mainWidget themes */
-    gtk_signal_connect( GTK_OBJECT(m_mainWidget), "expose_event",
-                GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this );
-    gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw",
-                GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this );
-
-#ifdef __WXDEBUG__
-    debug_focus_in( m_mainWidget, wxT("wxFrameGTK::m_mainWidget"), name );
-#endif
-
-    /* m_wxwindow only represents the client area without toolbar and menubar */
-    m_wxwindow = gtk_pizza_new();
-    gtk_widget_show( m_wxwindow );
-    gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );
-
-#ifdef __WXDEBUG__
-    debug_focus_in( m_wxwindow, wxT("wxFrameGTK::m_wxwindow"), name );
-#endif
-
-    /* we donm't allow the frame to get the focus as otherwise
-       the frame will grab it at arbitrary focus changes. */
-    GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
-
-    if (m_parent) m_parent->AddChild( 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 );
-
-    PostCreation();
-
-    if ((m_x != -1) || (m_y != -1))
-        gtk_widget_set_uposition( m_widget, m_x, m_y );
-    gtk_widget_set_usize( m_widget, m_width, m_height );
-
-    /*  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 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 );
-
-    /* map and unmap for iconized state */
-    gtk_signal_connect( GTK_OBJECT(m_widget), "map_event",
-        GTK_SIGNAL_FUNC(gtk_frame_map_callback), (gpointer)this );
-    gtk_signal_connect( GTK_OBJECT(m_widget), "unmap_event",
-        GTK_SIGNAL_FUNC(gtk_frame_unmap_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 );
-
-    /* disable native tab traversal */
-    gtk_signal_connect( GTK_OBJECT(m_widget), "focus",
-        GTK_SIGNAL_FUNC(gtk_frame_focus_callback), (gpointer)this );
-
-    return TRUE;
+    
+    return rt;

 }
 
 }
 

-wxFrameGTK::~wxFrameGTK()
+wxFrame::~wxFrame()

 {
     m_isBeingDeleted = TRUE;
 {
     m_isBeingDeleted = TRUE;

-

     DeleteAllBars();
     DeleteAllBars();

-
-    wxTopLevelWindows.DeleteObject( this );
-
-    if (wxTheApp->GetTopWindow() == this)
-        wxTheApp->SetTopWindow( (wxWindow*) NULL );
-
-    if ((wxTopLevelWindows.Number() == 0) &&
-        (wxTheApp->GetExitOnFrameDelete()))
-    {
-        wxTheApp->ExitMainLoop();
-    }
-}
-
-bool wxFrameGTK::ShowFullScreen(bool show, long style )
-{
-    if (show == m_fsIsShowing) return FALSE; // return what?
-
-    m_fsIsShowing = show;
-
-    if (show)
-    {
-        m_fsSaveStyle = m_windowStyle;
-        m_fsSaveFlag = style;
-        GetPosition( &m_fsSaveFrame.x, &m_fsSaveFrame.y );
-        GetSize( &m_fsSaveFrame.width, &m_fsSaveFrame.height );
-
-        gtk_widget_hide( m_widget );
-        gtk_widget_unrealize( m_widget );
-
-        m_windowStyle = wxSIMPLE_BORDER;
-
-        int x;
-        int y;
-        wxDisplaySize( &x, &y );
-        SetSize( 0, 0, x, y );
-
-        gtk_widget_realize( m_widget );
-        gtk_widget_show( m_widget );
-    }
-    else
-    {
-        gtk_widget_hide( m_widget );
-        gtk_widget_unrealize( m_widget );
-
-        m_windowStyle = m_fsSaveStyle;
-
-        SetSize( m_fsSaveFrame.x, m_fsSaveFrame.y, m_fsSaveFrame.width, m_fsSaveFrame.height );
-
-        gtk_widget_realize( m_widget );
-        gtk_widget_show( m_widget );
-    }
-
-    return TRUE;

 }
 
 // ----------------------------------------------------------------------------
 // overridden wxWindow methods
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // overridden wxWindow methods
 // ----------------------------------------------------------------------------
 

-bool wxFrameGTK::Show( bool show )
-{
-    wxASSERT_MSG( (m_widget != NULL), wxT("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 );
-}
-
-void wxFrameGTK::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) )
-{
-    wxFAIL_MSG( wxT("DoMoveWindow called for wxFrameGTK") );
-}
-
-void wxFrameGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
+void wxFrame::DoGetClientSize( int *width, int *height ) const

 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 

-    /* this shouldn't happen: wxFrameGTK, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */
-    wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
-
-    /* avoid recursions */
-    if (m_resizing)
-        return;
-    m_resizing = TRUE;
-
-    int old_x = m_x;
-    int old_y = m_y;
+    wxTopLevelWindow::DoGetClientSize( width, height );

 
 

-    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))
-    {
-        gtk_widget_set_usize( m_widget, m_width, m_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;
-}
-
-void wxFrameGTK::DoGetClientSize( int *width, int *height ) const
-{
-    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
-
-    wxWindow::DoGetClientSize( width, height );

     if (height)
     {
     if (height)
     {

-#if wxUSE_MENUS
-        /* 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
+#endif // wxUSE_MENUS_NATIVE

 
 #if wxUSE_STATUSBAR
 
 #if wxUSE_STATUSBAR

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

 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR

-        /* tool bar */
+        // tool bar

         if (m_frameToolBar && m_frameToolBar->IsShown())
         {
             if (m_toolBarDetached)
         if (m_frameToolBar && m_frameToolBar->IsShown())
         {
             if (m_toolBarDetached)


@@ -789,38 +293,31 @@ void wxFrameGTK::DoGetClientSize( int *width, int *height ) const
             }
         }
 #endif // wxUSE_TOOLBAR
             }
         }
 #endif // wxUSE_TOOLBAR

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

     }
 }
 
     }
 }
 

-void wxFrameGTK::DoSetClientSize( int width, int height )
+void wxFrame::DoSetClientSize( int width, int height )

 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 

-#if wxUSE_MENUS
-        /* 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
+#endif // wxUSE_MENUS_NATIVE

 
 #if wxUSE_STATUSBAR
 
 #if wxUSE_STATUSBAR

-        /* status bar */
+        // status bar

         if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT;
 #endif
 
 #if wxUSE_TOOLBAR
         if (m_frameStatusBar && m_frameStatusBar->IsShown()) height += wxSTATUS_HEIGHT;
 #endif
 
 #if wxUSE_TOOLBAR

-        /* tool bar */
+        // tool bar

         if (m_frameToolBar && m_frameToolBar->IsShown())
         {
             if (m_toolBarDetached)
         if (m_frameToolBar && m_frameToolBar->IsShown())
         {
             if (m_toolBarDetached)


@@ -843,71 +340,76 @@ void wxFrameGTK::DoSetClientSize( int width, int height )
         }
 #endif
 
         }
 #endif
 

-    DoSetSize( -1, -1, width + m_miniEdge*2, height  + m_miniEdge*2 + m_miniTitle, 0 );
+    wxTopLevelWindow::DoSetClientSize( width, height );

 }
 
 }
 

-void wxFrameGTK::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
+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;
 
                          int width, int height )
 {
     // 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;
     m_resizing = TRUE;
 
     if (m_resizing) return;
     m_resizing = TRUE;
 

-    /* this shouldn't happen: wxFrameGTK, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */
+    // 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;
 
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
 
     m_width = width;
     m_height = height;
 

-    /* space occupied by m_frameToolBar and m_frameMenuBar */
+    // space occupied by m_frameToolBar and m_frameMenuBar

     int client_area_x_offset = 0,
         client_area_y_offset = 0;
 
     int client_area_x_offset = 0,
         client_area_y_offset = 0;
 

-    /* wxMDIChildFrame derives from wxFrameGTK but it _is_ a wxWindow as it uses
+    /* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses

        wxWindow::Create to create it's GTK equivalent. m_mainWidget is only
        wxWindow::Create to create it's GTK equivalent. m_mainWidget is only

-       set in wxFrameGTK::Create so it is used to check what kind of frame we
+       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 */
 
        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 */
 

-    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;
+    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)
     {

-        /* set size hints */
+        // set size hints

         gint flag = 0; // GDK_HINT_POS;
         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;
+        if ((minWidth != -1) || (minHeight != -1)) flag |= GDK_HINT_MIN_SIZE;
+        if ((maxWidth != -1) || (maxHeight != -1)) flag |= GDK_HINT_MAX_SIZE;

         GdkGeometry geom;
         GdkGeometry geom;

-        geom.min_width = m_minWidth;
-        geom.min_height = m_minHeight;
-        geom.max_width = m_maxWidth;
-        geom.max_height = m_maxHeight;
+        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 );
 
         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. */
+        // 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
+#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;
             if (m_menuBarDetached) hh = wxPLACE_HOLDER;
             m_frameMenuBar->m_x = xx;
             m_frameMenuBar->m_y = yy;


@@ -918,7 +420,7 @@ void wxFrameGTK::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
                                   xx, yy, ww, hh );
             client_area_y_offset += hh;
         }
                                   xx, yy, ww, hh );
             client_area_y_offset += hh;
         }

-#endif // wxUSE_MENUS
+#endif // wxUSE_MENUS_NATIVE

 
 #if wxUSE_TOOLBAR
         if ((m_frameToolBar) && m_frameToolBar->IsShown() &&
 
 #if wxUSE_TOOLBAR
         if ((m_frameToolBar) && m_frameToolBar->IsShown() &&


@@ -926,20 +428,20 @@ void wxFrameGTK::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
         {
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
         {
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;

-#if wxUSE_MENUS
+#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;
             }

-#endif // wxUSE_MENUS
+#endif // wxUSE_MENUS_NATIVE

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

-            /* don't change the toolbar's reported height/width */
+            // don't change the toolbar's reported height/width

             int ww, hh;
             if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
             {
             int ww, hh;
             if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
             {


@@ -974,8 +476,8 @@ void wxFrameGTK::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
     }
     else
     {
     }
     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


@@ -1016,54 +518,46 @@ void wxFrameGTK::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
     m_resizing = FALSE;
 }
 
     m_resizing = FALSE;
 }
 

-void wxFrameGTK::MakeModal( bool modal )
+void wxFrame::OnInternalIdle()

 {
 {

-    if (modal)
-        gtk_grab_add( m_widget );
-    else
-        gtk_grab_remove( m_widget );
-}
+    wxFrameBase::OnInternalIdle();

 
 

-void wxFrameGTK::OnInternalIdle()
-{
-    if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
-    {
-        GtkOnSize( m_x, m_y, m_width, m_height );
-
-        // we'll come back later
-        if (g_isIdle)
-            wxapp_install_idle_handler();
-        return;
-    }
-
-#if wxUSE_MENUS
+#if wxUSE_MENUS_NATIVE

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

-#endif // wxUSE_MENUS
+#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

 }
 
 // ----------------------------------------------------------------------------
 // menu/tool/status bar stuff
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // menu/tool/status bar stuff
 // ----------------------------------------------------------------------------
 

-#if wxUSE_MENUS
+#if wxUSE_MENUS_NATIVE

 
 

-void wxFrameGTK::SetMenuBar( wxMenuBar *menuBar )
+void wxFrame::DetachMenuBar()

 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
 
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
 

-    if (menuBar == m_frameMenuBar)
-        return;
-
-    if (m_frameMenuBar)
+    if ( m_frameMenuBar )

     {
         m_frameMenuBar->UnsetInvokingWindow( this );
 
     {
         m_frameMenuBar->UnsetInvokingWindow( this );
 


@@ -1076,12 +570,17 @@ void wxFrameGTK::SetMenuBar( wxMenuBar *menuBar )
                 GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
         }
 
                 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_ref( m_frameMenuBar->m_widget );

-        gtk_widget_unparent( m_frameMenuBar->m_widget );
+
+        gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );

     }
 
     }
 

-    m_frameMenuBar = menuBar;
+    wxFrameBase::DetachMenuBar();
+}
+
+void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
+{
+    wxFrameBase::AttachMenuBar(menuBar);

 
     if (m_frameMenuBar)
     {
 
     if (m_frameMenuBar)
     {


@@ -1103,19 +602,42 @@ void wxFrameGTK::SetMenuBar( wxMenuBar *menuBar )
             gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached",
                 GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
         }
             gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached",
                 GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
         }

+        
+        gtk_widget_show( m_frameMenuBar->m_widget );

 
 

-        m_frameMenuBar->Show( TRUE );
+        UpdateMenuBarSize();

     }
     }

+    else
+    {
+        m_menuBarHeight = 2;
+        GtkUpdateSize();        // resize window in OnInternalIdle
+    }
+}
+
+void wxFrame::UpdateMenuBarSize()
+{
+    GtkRequisition  req;
+
+    req.width = 2;
+    req.height = 2;
+    
+    // this is called after Remove with a NULL m_frameMenuBar
+    if ( m_frameMenuBar )
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_frameMenuBar->m_widget) )->size_request )
+        (m_frameMenuBar->m_widget, &req );
+
+    m_menuBarHeight = req.height;
+
+        // resize window in OnInternalIdle

 
 

-    /* resize window in OnInternalIdle */
-    m_sizeSet = FALSE;
+    GtkUpdateSize();

 }
 
 }
 

-#endif // wxUSE_MENUS
+#endif // wxUSE_MENUS_NATIVE

 
 #if wxUSE_TOOLBAR
 
 
 #if wxUSE_TOOLBAR
 

-wxToolBar* wxFrameGTK::CreateToolBar( long style, wxWindowID id, const wxString& name )
+wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& name )

 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 


@@ -1125,18 +647,20 @@ wxToolBar* wxFrameGTK::CreateToolBar( long style, wxWindowID id, const wxString&
 
     m_insertInClientArea = TRUE;
 
 
     m_insertInClientArea = TRUE;
 

-    m_sizeSet = FALSE;
+    GtkUpdateSize();

 
     return m_frameToolBar;
 }
 
 
     return m_frameToolBar;
 }
 

-void wxFrameGTK::SetToolBar(wxToolBar *toolbar)
+void wxFrame::SetToolBar(wxToolBar *toolbar)

 {
 {

+    bool hadTbar = m_frameToolBar != NULL;
+

     wxFrameBase::SetToolBar(toolbar);
 
     wxFrameBase::SetToolBar(toolbar);
 

-    if (m_frameToolBar)
+    if ( m_frameToolBar )

     {
     {

-        /* insert into toolbar area if not already there */
+        // insert into toolbar area if not already there

         if ((m_frameToolBar->m_widget->parent) &&
             (m_frameToolBar->m_widget->parent != m_mainWidget))
         {
         if ((m_frameToolBar->m_widget->parent) &&
             (m_frameToolBar->m_widget->parent != m_mainWidget))
         {


@@ -1146,13 +670,21 @@ void wxFrameGTK::SetToolBar(wxToolBar *toolbar)
             GtkUpdateSize();
         }
     }
             GtkUpdateSize();
         }
     }

+    else // toolbar unset
+    {
+        // still need to update size if it had been there before
+        if ( hadTbar )
+        {
+            GtkUpdateSize();
+        }
+    }

 }
 
 #endif // wxUSE_TOOLBAR
 
 #if wxUSE_STATUSBAR
 
 }
 
 #endif // wxUSE_TOOLBAR
 
 #if wxUSE_STATUSBAR
 

-wxStatusBar* wxFrameGTK::CreateStatusBar(int number,
+wxStatusBar* wxFrame::CreateStatusBar(int number,

                                       long style,
                                       wxWindowID id,
                                       const wxString& name)
                                       long style,
                                       wxWindowID id,
                                       const wxString& name)


@@ -1160,94 +692,27 @@ wxStatusBar* wxFrameGTK::CreateStatusBar(int number,
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
     // because it will change when toolbar is added
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
     // because it will change when toolbar is added

-    m_sizeSet = FALSE;
+    GtkUpdateSize();

 
     return wxFrameBase::CreateStatusBar( number, style, id, name );
 }
 
 
     return wxFrameBase::CreateStatusBar( number, style, id, name );
 }
 

-void wxFrameGTK::PositionStatusBar()
+void wxFrame::SetStatusBar(wxStatusBar *statbar)

 {
 {

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

 }
 }

-#endif // wxUSE_STATUSBAR

 
 

-// ----------------------------------------------------------------------------
-// frame title/icon
-// ----------------------------------------------------------------------------
-
-void wxFrameGTK::SetTitle( const wxString &title )
-{
-    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
-
-    m_title = title;
-    gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );
-}
-
-void wxFrameGTK::SetIcon( const wxIcon &icon )
+void wxFrame::PositionStatusBar()

 {
 {

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

         return;
 
         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 );
-}
-
-// ----------------------------------------------------------------------------
-// frame state: maximized/iconized/normal
-// ----------------------------------------------------------------------------
-
-void wxFrameGTK::Maximize(bool WXUNUSED(maximize))
-{
-    wxFAIL_MSG( _T("not implemented") );
-}
-
-bool wxFrameGTK::IsMaximized() const
-{
-  //    wxFAIL_MSG( _T("not implemented") );
-
-    // This is an approximation
-    return FALSE;
-}
-
-void wxFrameGTK::Restore()
-{
-    wxFAIL_MSG( _T("not implemented") );
-}
-
-void wxFrameGTK::Iconize( bool iconize )
-{
-   if (iconize)
-   {
-        XIconifyWindow( GDK_WINDOW_XDISPLAY( m_widget->window ),
-                        GDK_WINDOW_XWINDOW( m_widget->window ),
-                        DefaultScreen( GDK_DISPLAY() ) );
-   }
-}
-
-bool wxFrameGTK::IsIconized() const
-{
-    return m_isIconized;
-}
-
-void wxFrameGTK::SetIconizeState(bool iconize)
-{
-    if ( iconize != m_isIconized )
-    {
-        m_isIconized = iconize;
-        (void)SendIconizeEvent(iconize);
-    }
+    GtkUpdateSize();

 }
 }

+#endif // wxUSE_STATUSBAR