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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index ae11c5097e..61259fad4b 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -8,7 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "frame.h"
+    #pragma implementation "frame.h"
 #endif
 
 #include "wx/frame.h"
@@ -16,10 +16,19 @@
 #include "wx/control.h"
 #include "wx/app.h"
 #include "wx/menu.h"
+#if wxUSE_TOOLBAR
 #include "wx/toolbar.h"
+#endif
+#if wxUSE_STATUSBAR
 #include "wx/statusbr.h"
+#endif
 #include "wx/dcclient.h"
+
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
+#include "gdk/gdkkeysyms.h"
 
 //-----------------------------------------------------------------------------
 // constants
@@ -27,35 +36,48 @@
 
 const int wxMENU_HEIGHT    = 27;
 const int wxSTATUS_HEIGHT  = 25;
+const int wxPLACE_HOLDER   = 0;
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
-extern wxList wxTopLevelWindows;
 extern wxList wxPendingDelete;
 
+//-----------------------------------------------------------------------------
+// debug
+//-----------------------------------------------------------------------------
+
+#ifdef __WXDEBUG__
+
+extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window );
+
+#endif
+
 //-----------------------------------------------------------------------------
 // "size_allocate"
 //-----------------------------------------------------------------------------
 
 static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
 {
-    if (!win->HasVMT()) return;
+    if (g_isIdle)
+        wxapp_install_idle_handler();
 
-/*
-    printf( "OnFrameResize from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
+    if (!win->m_hasVMT) return;
 
-   if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
-   {
-       win->m_sizeSet = FALSE;
-       win->m_width = alloc->width;
-       win->m_height = alloc->height;
-   }
+    if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
+    {
+        win->m_width = alloc->width;
+        win->m_height = alloc->height;
+        win->UpdateSize();
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -64,32 +86,233 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 
 static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win )
 {
-/*
-    printf( "OnDelete from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
+    if (g_isIdle)
+        wxapp_install_idle_handler();
 
     win->Close();
 
     return TRUE;
 }
 
+//-----------------------------------------------------------------------------
+// "child_attached" of menu bar
+//-----------------------------------------------------------------------------
+
+static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
+{
+    if (!win->m_hasVMT) return;
+
+    win->m_menuBarDetached = FALSE;
+    win->UpdateSize();
+}
+
+//-----------------------------------------------------------------------------
+// "child_detached" of menu bar
+//-----------------------------------------------------------------------------
+
+static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
+{
+    if (!win->m_hasVMT) return;
+
+    win->m_menuBarDetached = TRUE;
+    win->UpdateSize();
+}
+
+#if wxUSE_TOOLBAR
+//-----------------------------------------------------------------------------
+// "child_attached" of tool bar
+//-----------------------------------------------------------------------------
+
+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();
+}
+
+//-----------------------------------------------------------------------------
+// "child_detached" of tool bar
+//-----------------------------------------------------------------------------
+
+static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSED(child), wxFrame *win )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (!win->m_hasVMT) return;
+
+    win->m_toolBarDetached = TRUE;
+    win->UpdateSize();
+}
+#endif // wxUSE_TOOLBAR
+
 //-----------------------------------------------------------------------------
 // "configure_event"
 //-----------------------------------------------------------------------------
 
-static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
+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 (!win->HasVMT()) return FALSE;
+    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;
+}
+
+//-----------------------------------------------------------------------------
+// "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 *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;
 }
 
+//-----------------------------------------------------------------------------
+// InsertChild for wxFrame
+//-----------------------------------------------------------------------------
+
+/* Callback for wxFrame. This very strange beast has to be used because
+ * C++ has no virtual methods in a constructor. We have to emulate a
+ * virtual function here as wxWindows requires different ways to insert
+ * a child in container classes. */
+
+static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
+{
+    if (!parent->m_insertInClientArea)
+    {
+        /* these are outside the client area */
+        wxFrame* frame = (wxFrame*) parent;
+        gtk_myfixed_put( GTK_MYFIXED(frame->m_mainWidget),
+                         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 (wxIS_KIND_OF(child,wxToolBar))
+        {
+            wxToolBar *toolBar = (wxToolBar*) child;
+            if (toolBar->GetWindowStyle() & wxTB_DOCKABLE)
+            {
+                gtk_signal_connect( GTK_OBJECT(toolBar->m_widget), "child_attached",
+                    GTK_SIGNAL_FUNC(gtk_toolbar_attached_callback), (gpointer)parent );
+
+                gtk_signal_connect( GTK_OBJECT(toolBar->m_widget), "child_detached",
+                    GTK_SIGNAL_FUNC(gtk_toolbar_detached_callback), (gpointer)parent );
+            }
+        }
+#endif // wxUSE_TOOLBAR
+    }
+    else
+    {
+        /* these are inside the client area */
+        gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
+                         GTK_WIDGET(child->m_widget),
+                         child->m_x,
+                         child->m_y,
+                         child->m_width,
+                         child->m_height );
+    }
+
+    /* resize on OnInternalIdle */
+    parent->UpdateSize();
+}
+
 //-----------------------------------------------------------------------------
 // wxFrame
 //-----------------------------------------------------------------------------
@@ -97,31 +320,35 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
     EVT_SIZE(wxFrame::OnSize)
     EVT_CLOSE(wxFrame::OnCloseWindow)
-    EVT_IDLE(wxFrame::OnIdle)
+    EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
 
-wxFrame::wxFrame()
+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 )
 {
-    m_frameMenuBar = (wxMenuBar *) NULL;
-    m_frameStatusBar = (wxStatusBar *) NULL;
-    m_frameToolBar = (wxToolBar *) NULL;
-    m_sizeSet = FALSE;
-    m_miniEdge = 0;
-    m_miniTitle = 0;
+    Init();
+
     Create( parent, id, title, pos, size, style, name );
 }
 
@@ -137,71 +364,105 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 
     m_title = title;
 
+    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, "wxFrame::m_widget", name );
+    debug_focus_in( m_widget, _T("wxFrame::m_widget"), name );
 #endif
 
-    if ((size.x != -1) && (size.y != -1))
-        gtk_widget_set_usize( m_widget, m_width, m_height );
-    if ((pos.x != -1) && (pos.y != -1))
-        gtk_widget_set_uposition( m_widget, m_x, m_y );
-
-    gtk_window_set_title( GTK_WINDOW(m_widget), title );
+    gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );
     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 
-    gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL );
-
     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_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
+    gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );
 
 #ifdef __WXDEBUG__
-        debug_focus_in( m_wxwindow, "wxFrame::m_wxwindow", name );
+    debug_focus_in( m_wxwindow, _T("wxFrame::m_wxwindow"), name );
 #endif
 
-    gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
+    /* 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 );
 
-    if (m_parent) m_parent->AddChild( this );
-
-    PostCreation();
-
     return TRUE;
 }
 
 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 (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
+
+    if (wxTheApp->GetTopWindow() == this)
+        wxTheApp->SetTopWindow( (wxWindow*) NULL );
+
+    if (wxTopLevelWindows.Number() == 0)
+        wxTheApp->ExitMainLoop();
 }
 
 bool wxFrame::Show( bool show )
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+    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 nor from within the size_allocate
-  // handler, because GTK 1.1.X forbids that.
+        /* 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 );
     }
@@ -209,46 +470,24 @@ bool wxFrame::Show( bool show )
     return wxWindow::Show( show );
 }
 
-void wxFrame::OnCloseWindow( wxCloseEvent &event )
-{
-    if (GetEventHandler()->OnClose() || event.GetForce()) this->Destroy();
-}
-
 bool wxFrame::Destroy()
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
 
     if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
 
     return TRUE;
 }
 
-wxPoint wxFrame::GetClientAreaOrigin() const
-{
-    wxPoint pt( m_miniEdge, m_miniEdge + m_miniTitle );
-    if (m_frameMenuBar)
-    {
-        int h = 0;
-        m_frameMenuBar->GetSize( (int*)NULL, &h );
-        pt.y += h;
-    }
-    if (m_frameToolBar)
-    {
-        int h = 0;
-        m_frameToolBar->GetSize( (int*)NULL, &h );
-        pt.y += h;
-    }
-    return pt;
-}
-
-void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
+void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid window" );
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
 
-    // Don't do anything for children of wxMDIChildFrame
-    if (!m_wxwindow) return;
+    /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */
+    wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid frame") );
 
-    if (m_resizing) return; // I don't like recursions
+    /* avoid recursions */
+    if (m_resizing) return;
     m_resizing = TRUE;
 
     int old_x = m_x;
@@ -256,7 +495,7 @@ void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
     int old_width = m_width;
     int old_height = m_height;
 
-    if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
+    if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)
     {
         if (x != -1) m_x = x;
         if (y != -1) m_y = y;
@@ -283,60 +522,78 @@ void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
 
     if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
     if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
-    if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth;
-    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
+    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;
     }
 
-    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( event );
-
     m_resizing = FALSE;
 }
 
-void wxFrame::SetSize( int width, int height )
-{
-    SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
-}
-
 void wxFrame::Centre( int direction )
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+    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;
+    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 );
 }
 
-void wxFrame::GetClientSize( int *width, int *height ) const
+void wxFrame::DoGetClientSize( int *width, int *height ) const
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
 
-    wxWindow::GetClientSize( width, height );
+    wxWindow::DoGetClientSize( width, height );
     if (height)
     {
-        if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT;
+        /* menu bar */
+        if (m_frameMenuBar)
+        {
+            if (!m_menuBarDetached)
+                (*height) -= wxMENU_HEIGHT;
+            else
+                (*height) -= wxPLACE_HOLDER;
+        }
+
+#if wxUSE_STATUSBAR
+        /* status bar */
         if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
+#endif
+
+#if wxUSE_TOOLBAR
+        /* tool bar */
         if (m_frameToolBar)
         {
-            int y = 0;
-            m_frameToolBar->GetSize( (int *) NULL, &y );
-            (*height) -= y;
+            if (!m_toolBarDetached)
+            {
+                int y = 0;
+                m_frameToolBar->GetSize( (int *) NULL, &y );
+                (*height) -= y;
+            }
+            else
+                (*height) -= wxPLACE_HOLDER;
         }
+#endif
+
+        /* mini edge */
         (*height) -= m_miniEdge*2 + m_miniTitle;
     }
     if (width)
@@ -345,20 +602,40 @@ void wxFrame::GetClientSize( int *width, int *height ) const
     }
 }
 
-void wxFrame::SetClientSize( int const width, int const height )
+void wxFrame::DoSetClientSize( int width, int height )
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
 
-    int h = height;
-    if (m_frameMenuBar) h += wxMENU_HEIGHT;
-    if (m_frameStatusBar) h += wxSTATUS_HEIGHT;
-    if (m_frameToolBar)
-    {
-        int y = 0;
-        m_frameToolBar->GetSize( (int *) NULL, &y );
-        h += y;
-    }
-    wxWindow::SetClientSize( width + m_miniEdge*2, h  + m_miniEdge*2 + m_miniTitle );
+        /* menu bar */
+        if (m_frameMenuBar)
+        {
+            if (!m_menuBarDetached)
+                height += wxMENU_HEIGHT;
+            else
+                height += wxPLACE_HOLDER;
+        }
+
+#if wxUSE_STATUSBAR
+        /* status bar */
+        if (m_frameStatusBar) height += wxSTATUS_HEIGHT;
+#endif
+
+#if wxUSE_TOOLBAR
+        /* tool bar */
+        if (m_frameToolBar)
+        {
+            if (!m_toolBarDetached)
+            {
+                int y = 0;
+                m_frameToolBar->GetSize( (int *) NULL, &y );
+                height += y;
+            }
+            else
+                height += wxPLACE_HOLDER;
+        }
+#endif
+
+    wxWindow::DoSetClientSize( width + m_miniEdge*2, height  + m_miniEdge*2 + m_miniTitle );
 }
 
 void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
@@ -367,169 +644,240 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
     // m_x = x;
     // m_y = y;
 
+    /* avoid recursions */
     if (m_resizing) return;
     m_resizing = TRUE;
 
-    if (!m_wxwindow) return;
+    /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */
+    wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid frame") );
 
     m_width = width;
     m_height = height;
 
-    if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
-    if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
-    if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth;
-    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
-
-    gtk_widget_set_usize( m_widget, m_width, m_height );
+    /* space occupied by m_frameToolBar and m_frameMenuBar */
+    int client_area_y_offset = 0;
 
-    // this emulates the new wxMSW behaviour of placing all
-    // frame-subwindows (menu, toolbar..) on one native window
-        // OK, this hurts in the eye, but I don't want to call SetSize()
-        // because I don't want to call any non-native functions here.
+    /* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses
+       wxWindow::Create to create it's GTK equivalent. m_mainWidget is only
+       set in wxFrame::Create so it is used to check what kind of frame we
+       have here. if m_mainWidget is NULL it is a wxMDIChildFrame and so we
+       skip the part which handles m_frameMenuBar, m_frameToolBar and (most
+       importantly) m_mainWidget */
 
-    if (m_frameMenuBar)
+    if (m_mainWidget)
     {
-        int xx = m_miniEdge;
-  int yy = m_miniEdge + m_miniTitle;
-  int ww = m_width  - 2*m_miniEdge;
-  int hh = wxMENU_HEIGHT;
-        m_frameMenuBar->m_x = xx;
-        m_frameMenuBar->m_y = yy;
-        m_frameMenuBar->m_width = ww;
-        m_frameMenuBar->m_height = hh;
-
-        gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameMenuBar->m_widget, xx, yy );
-        gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh );
-    }
+        /* 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. */
+
+        if (m_frameMenuBar)
+        {
+            int xx = m_miniEdge;
+            int yy = m_miniEdge + m_miniTitle;
+            int ww = m_width  - 2*m_miniEdge;
+            int hh = wxMENU_HEIGHT;
+            if (m_menuBarDetached) hh = wxPLACE_HOLDER;
+            m_frameMenuBar->m_x = xx;
+            m_frameMenuBar->m_y = yy;
+            m_frameMenuBar->m_width = ww;
+            m_frameMenuBar->m_height = hh;
+            gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
+                                  m_frameMenuBar->m_widget,
+                                  xx, yy, ww, hh );
+            client_area_y_offset += hh;
+        }
 
-    if (m_frameToolBar)
+#if wxUSE_TOOLBAR
+        if (m_frameToolBar)
+        {
+            int xx = m_miniEdge;
+            int yy = m_miniEdge + m_miniTitle;
+            if (m_frameMenuBar)
+            {
+                if (!m_menuBarDetached)
+                    yy += wxMENU_HEIGHT;
+                else
+                    yy += wxPLACE_HOLDER;
+            }
+            int ww = m_width - 2*m_miniEdge;
+            int hh = m_frameToolBar->m_height;
+	    if (m_toolBarDetached) hh = wxPLACE_HOLDER;
+            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),
+                                  m_frameToolBar->m_widget,
+                                  xx, yy, ww, hh );
+            client_area_y_offset += hh;
+        }
+#endif
+
+        int client_x = m_miniEdge;
+        int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;
+        int client_w = m_width - 2*m_miniEdge;
+        int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;
+        gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
+                              m_wxwindow,
+                              client_x, client_y, client_w, client_h );
+    }
+    else
     {
-        int xx = m_miniEdge;
-  int yy = m_miniEdge + m_miniTitle;
-        if (m_frameMenuBar) yy += wxMENU_HEIGHT;
-  int ww = m_width - 2*m_miniEdge;
-        int hh = m_frameToolBar->m_height;
-
-        m_frameToolBar->m_x = xx;
-        m_frameToolBar->m_y = yy;
-        m_frameToolBar->m_height = hh;
-        m_frameToolBar->m_width = ww;
-
-        gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameToolBar->m_widget, xx, yy );
-        gtk_widget_set_usize( m_frameToolBar->m_widget, ww, hh );
+        /* if there is no m_mainWidget between m_widget and m_wxwindow there
+           is no need to set the size or position of m_wxwindow. */
     }
 
+#if wxUSE_STATUSBAR
     if (m_frameStatusBar)
     {
         int xx = 0 + m_miniEdge;
-  int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge;
-  int ww = m_width - 2*m_miniEdge;
-  int hh = wxSTATUS_HEIGHT;
-
+        int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset;
+        int ww = m_width - 2*m_miniEdge;
+        int hh = wxSTATUS_HEIGHT;
         m_frameStatusBar->m_x = xx;
         m_frameStatusBar->m_y = yy;
         m_frameStatusBar->m_width = ww;
         m_frameStatusBar->m_height = hh;
-
-        gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, xx, yy );
-        gtk_widget_set_usize( m_frameStatusBar->m_widget, ww, hh );
+        gtk_myfixed_set_size( GTK_MYFIXED(m_wxwindow),
+                              m_frameStatusBar->m_widget,
+                              xx, yy, ww, hh );
     }
+#endif
+
+    /* we actually set the size of a frame here and no-where else */
+    gtk_widget_set_usize( m_widget, m_width, m_height );
 
     m_sizeSet = TRUE;
 
+    /* send size event to frame */
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
 
+    /* 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 );
+    }
+
     m_resizing = FALSE;
 }
 
-void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event) )
+void wxFrame::MakeModal( bool modal )
+{
+    if (modal)
+        gtk_grab_add( m_widget );
+    else
+        gtk_grab_remove( m_widget );
+}
+
+void wxFrame::OnInternalIdle()
 {
-    if (!m_sizeSet)
+    if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
         GtkOnSize( m_x, m_y, m_width, m_height );
 
     DoMenuUpdates();
+
+    if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle();
+#if wxUSE_TOOLBAR
+    if (m_frameToolBar) m_frameToolBar->OnInternalIdle();
+#endif
+#if wxUSE_STATUSBAR
+    if (m_frameStatusBar) m_frameStatusBar->OnInternalIdle();
+#endif
+}
+
+void wxFrame::OnCloseWindow( wxCloseEvent& WXUNUSED(event) )
+{
+    Destroy();
 }
 
 void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
 
+#if wxUSE_CONSTRAINTS
     if (GetAutoLayout())
     {
         Layout();
     }
     else
+#endif // wxUSE_CONSTRAINTS
     {
-        // no child: go out !
-        if (!GetChildren().First()) return;
-
-        // do we have exactly one child?
-        wxWindow *child = (wxWindow *) NULL;
-        for(wxNode *node = GetChildren().First(); node; node = node->Next())
+        /* do we have exactly one child? */
+        wxWindow *child = (wxWindow *)NULL;
+        for ( wxNode *node = GetChildren().First(); node; node = node->Next() )
         {
             wxWindow *win = (wxWindow *)node->Data();
-            if (!wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog)
-#if 0  // not in m_children anyway ?
-              && (win != m_frameMenuBar) &&
-              (win != m_frameToolBar) &&
-              (win != m_frameStatusBar)
-#endif
-            )
+            if ( !wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog) )
             {
-          // it's the second one: do nothing
-                if (child) return;
+                if (child)
+                {
+                    /* it's the second one: do nothing */
+                    return;
+                }
+
                 child = win;
             }
         }
 
-        // yes: set it's size to fill all the frame
-        int client_x, client_y;
-        GetClientSize( &client_x, &client_y );
-        child->SetSize( 1, 1, client_x-2, client_y-2 );
-    }
-}
-
-static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
-{
-    menu->SetInvokingWindow( win );
-    wxNode *node = menu->m_items.First();
-    while (node)
-    {
-        wxMenuItem *menuitem = (wxMenuItem*)node->Data();
-        if (menuitem->IsSubMenu())
-            SetInvokingWindow( menuitem->GetSubMenu(), win );
-        node = node->Next();
+        /* 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 );
+        }
     }
 }
 
 void wxFrame::SetMenuBar( wxMenuBar *menuBar )
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-    wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" );
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
+    wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid frame") );
 
     m_frameMenuBar = menuBar;
 
     if (m_frameMenuBar)
     {
-        wxNode *node = m_frameMenuBar->m_menus.First();
-        while (node)
-        {
-            wxMenu *menu = (wxMenu*)node->Data();
-            SetInvokingWindow( menu, this );
-            node = node->Next();
-        }
+        m_frameMenuBar->SetInvokingWindow( this );
 
-        if (m_frameMenuBar->m_parent != this)
+        if (m_frameMenuBar->GetParent() != this)
         {
-            m_frameMenuBar->m_parent = this;
-            gtk_myfixed_put( GTK_MYFIXED(m_wxwindow),
-                m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
+            m_frameMenuBar->SetParent(this);
+            gtk_myfixed_put( GTK_MYFIXED(m_mainWidget),
+                m_frameMenuBar->m_widget,
+                m_frameMenuBar->m_x,
+                m_frameMenuBar->m_y,
+                m_frameMenuBar->m_width,
+                m_frameMenuBar->m_height );
+
+            if (menuBar->GetWindowStyle() & wxMB_DOCKABLE)
+            {
+                gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_attached",
+                    GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this );
+
+                gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached",
+                    GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
+            }
+	    
+	    m_frameMenuBar->Show( TRUE );
         }
     }
 
-    if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
+    /* resize window in OnInternalIdle */
+    m_sizeSet = FALSE;
 }
 
 wxMenuBar *wxFrame::GetMenuBar() const
@@ -537,17 +885,45 @@ wxMenuBar *wxFrame::GetMenuBar() const
     return m_frameMenuBar;
 }
 
-wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
+void wxFrame::OnMenuHighlight(wxMenuEvent& event)
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+#if wxUSE_STATUSBAR
+    if (GetStatusBar())
+    {
+        // if no help string found, we will clear the status bar text
+        wxString helpString;
 
-    wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" );
+        int menuId = event.GetMenuId();
+        if ( menuId != -1 )
+        {
+            wxMenuBar *menuBar = GetMenuBar();
+            if (menuBar)
+            {
+                helpString = menuBar->GetHelpString(menuId);
+            }
+        }
+
+        SetStatusText(helpString);
+    }
+#endif // wxUSE_STATUSBAR
+}
+
+#if wxUSE_TOOLBAR
+wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& name )
+{
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
+
+    wxCHECK_MSG( m_frameToolBar == NULL, FALSE, _T("recreating toolbar in wxFrame") );
+
+    m_insertInClientArea = FALSE;
 
     m_frameToolBar = OnCreateToolBar( style, id, name );
 
-    GetChildren().DeleteObject( m_frameToolBar );
+    if (m_frameToolBar) GetChildren().DeleteObject( m_frameToolBar );
 
-    if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
+    m_insertInClientArea = TRUE;
+
+    m_sizeSet = FALSE;
 
     return m_frameToolBar;
 }
@@ -561,16 +937,18 @@ 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), "invalid frame" );
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
 
-    wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" );
+    wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, _T("recreating status bar in wxFrame") );
 
     m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
 
-    if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
+    m_sizeSet = FALSE;
 
     return m_frameStatusBar;
 }
@@ -596,45 +974,68 @@ wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id,
     return statusBar;
 }
 
+wxStatusBar *wxFrame::GetStatusBar() const
+{
+    return m_frameStatusBar;
+}
+
 void wxFrame::SetStatusText(const wxString& text, int number)
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
 
-    wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
+    wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set text for") );
 
     m_frameStatusBar->SetStatusText(text, number);
 }
 
 void wxFrame::SetStatusWidths(int n, const int widths_field[] )
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
 
-    wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
+    wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set widths for") );
 
     m_frameStatusBar->SetStatusWidths(n, widths_field);
 }
+#endif // wxUSE_STATUSBAR
 
-wxStatusBar *wxFrame::GetStatusBar() const
+void wxFrame::Command( int id )
 {
-    return m_frameStatusBar;
+    wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
+    commandEvent.SetInt( id );
+    commandEvent.SetEventObject( this );
+
+    wxMenuBar *bar = GetMenuBar();
+    if (!bar) return;
+
+    wxMenuItem *item = bar->FindItemForId(id) ;
+    if (item && item->IsCheckable())
+    {
+        bar->Check(id,!bar->Checked(id)) ;
+    }
+
+    wxEvtHandler* evtHandler = GetEventHandler();
+
+    evtHandler->ProcessEvent(commandEvent);
 }
 
 void wxFrame::SetTitle( const wxString &title )
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
 
     m_title = title;
-    if (m_title.IsNull()) m_title = "";
-    gtk_window_set_title( GTK_WINDOW(m_widget), title );
+    if (m_title.IsNull()) m_title = _T("");
+    gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );
 }
 
 void wxFrame::SetIcon( const wxIcon &icon )
 {
-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
 
     m_icon = icon;
     if (!icon.Ok()) return;
 
+    if (!m_widget->window) return;
+
     wxMask *mask = icon.GetMask();
     GdkBitmap *bm = (GdkBitmap *) NULL;
     if (mask) bm = mask->GetBitmap();