don't do anything before including the PCH header

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 235078cff1dd9051e6b9bdd39de749ceead06e29..48b111dc80732e6a1384238459cf86f242be9dd8 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        frame.cpp
+// Name:        src/gtk/frame.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,573 +7,671 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "frame.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/frame.h"
 
 #include "wx/frame.h"

-#include "wx/dialog.h"
-#include "wx/control.h"
-#include "wx/app.h"
-#include "wx/menu.h"
-#include "wx/toolbar.h"
-#include "wx/statusbr.h"
-#include "wx/mdi.h"
-#include "wx/dcclient.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/menu.h"
+    #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
+#endif // WX_PRECOMP
+
+#include <gtk/gtk.h>

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

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

 // constants
 // constants

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+
+static const int wxSTATUS_HEIGHT  = 25;
+static const int wxPLACE_HOLDER   = 0;
+
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------

 
 

-const int wxMENU_HEIGHT    = 30;
-const int wxSTATUS_HEIGHT  = 25;
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// GTK callbacks
+// ----------------------------------------------------------------------------
+
+#if wxUSE_MENUS_NATIVE

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

-// data
+// "child_attached" of menu bar

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

-extern wxList wxTopLevelWindows;
-extern wxList wxPendingDelete;
+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();
+}
+}

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

-// "size_allocate"
+// "child_detached" of menu bar

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

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

 {
 {

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

 
 

-/*
-  printf( "OnFrameResize from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
+    // Raise the client area area
+    gdk_window_raise( win->m_wxwindow->window );

 
 

-  win->GtkOnSize( alloc->x, alloc->y, alloc->width, alloc->height );
+    win->m_menuBarDetached = true;
+    win->GtkUpdateSize();

 }
 }

+}
+
+#endif // wxUSE_MENUS_NATIVE

 
 

+#if wxUSE_TOOLBAR

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

-// "delete_event"
+// "child_attached" of tool bar

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

-static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win )
+extern "C" {
+static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )

 {
 {

-/*
-  printf( "OnDelete from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
+    if (!win->m_hasVMT) return;

 
 

-  win->Close();
-
-  return TRUE;
+    win->m_toolBarDetached = false;
+    win->GtkUpdateSize();
+}

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// "configure_event"
+// "child_detached" of tool bar

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

-static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
+extern "C" {
+static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )

 {
 {

-  if (!win->HasVMT()) return FALSE;
-  
-  win->m_x = event->x;
-  win->m_y = event->y;
-  
-  return FALSE;
+    if (!win->m_hasVMT) return;
+
+    // Raise the client area area
+    gdk_window_raise( win->m_wxwindow->window );
+
+    win->m_toolBarDetached = true;
+    win->GtkUpdateSize();
+}

 }
 }

+#endif // wxUSE_TOOLBAR
+
+
+// ----------------------------------------------------------------------------
+// wxFrame itself
+// ----------------------------------------------------------------------------

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

-// wxFrame
+// InsertChild for wxFrame

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

-BEGIN_EVENT_TABLE(wxFrame, wxWindow)
-  EVT_SIZE(wxFrame::OnSize)
-  EVT_CLOSE(wxFrame::OnCloseWindow)
-  EVT_IDLE(wxFrame::OnIdle)
-END_EVENT_TABLE()
+#if wxUSE_TOOLBAR

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
+/* Callback for wxFrame. This very strange beast has to be used because
+ * C++ has no virtual methods in a constructor. We have to emulate a
+ * virtual function here as wxWidgets requires different ways to insert
+ * a child in container classes. */

 
 

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

 {
 {

-  m_frameMenuBar = (wxMenuBar *) NULL;
-  m_frameStatusBar = (wxStatusBar *) NULL;
-  m_frameToolBar = (wxToolBar *) NULL;
-  m_sizeSet = FALSE;
-  m_addPrivateChild = FALSE;
-  m_wxwindow = (GtkWidget *) NULL;
-  m_mainWindow = (GtkWidget *) NULL;
-  wxTopLevelWindows.Insert( this );
+    wxASSERT( GTK_IS_WIDGET(child->m_widget) );
+
+    // These are outside the client area
+    wxFrame* frame = wx_static_cast(wxFrame*, parent);
+    gtk_pizza_put( GTK_PIZZA(frame->m_mainWidget),
+                     child->m_widget,
+                     child->m_x,
+                     child->m_y,
+                     child->m_width,
+                     child->m_height );
+
+#if wxUSE_TOOLBAR_NATIVE
+    // We connect to these events for recalculating the client area
+    // space when the toolbar is floating
+    if (wxIS_KIND_OF(child,wxToolBar))
+    {
+        if (child->HasFlag(wxTB_DOCKABLE))
+        {
+            g_signal_connect (child->m_widget, "child_attached",
+                              G_CALLBACK (gtk_toolbar_attached_callback),
+                              parent);
+            g_signal_connect (child->m_widget, "child_detached",
+                              G_CALLBACK (gtk_toolbar_detached_callback),
+                              parent);
+        }
+    }
+#endif // wxUSE_TOOLBAR_NATIVE

 }
 
 }
 

-wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
+#endif // wxUSE_TOOLBAR
+
+// ----------------------------------------------------------------------------
+// wxFrame creation
+// ----------------------------------------------------------------------------
+
+void wxFrame::Init()

 {
 {

-  m_frameMenuBar = (wxMenuBar *) NULL;
-  m_frameStatusBar = (wxStatusBar *) NULL;
-  m_frameToolBar = (wxToolBar *) NULL;
-  m_sizeSet = FALSE;
-  m_addPrivateChild = FALSE;
-  m_wxwindow = (GtkWidget *) NULL;
-  m_mainWindow = (GtkWidget *) NULL;
-  Create( parent, id, title, pos, size, style, name );
-  wxTopLevelWindows.Insert( this );
+    m_menuBarDetached = false;
+    m_toolBarDetached = false;
+    m_menuBarHeight = 2;
+    m_fsSaveFlag = 0;

 }
 
 }
 

-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 )

 {
 {

-  m_needParent = FALSE;
+    return wxFrameBase::Create(parent, id, title, pos, sizeOrig, style, name);
+}

 
 

-  PreCreation( parent, id, pos, size, style, name );
+wxFrame::~wxFrame()
+{
+    m_isBeingDeleted = true;
+    DeleteAllBars();
+}

 
 

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

 
 

-  GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
-  if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP;
-  
-  m_widget = gtk_window_new( win_type );
-  if ((size.x != -1) && (size.y != -1))
-    gtk_widget_set_usize( m_widget, m_width, m_height );
-  if ((pos.x != -1) && (pos.y != -1))
-    gtk_widget_set_uposition( m_widget, m_x, m_y );
+void wxFrame::DoGetClientSize( int *width, int *height ) const
+{
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

 
 

-  gtk_window_set_title( GTK_WINDOW(m_widget), title );
-  GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
+    wxFrameBase::DoGetClientSize(width, height);

 
 

-  gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL);
+    if (height)
+    {
+#if wxUSE_MENUS_NATIVE
+        // menu bar
+        if (HasVisibleMenubar() && !m_menuBarDetached)
+        {
+            *height -= m_menuBarHeight;
+        }
+#endif // wxUSE_MENUS_NATIVE
+
+#if wxUSE_STATUSBAR
+        // status bar
+        if (m_frameStatusBar && GTK_WIDGET_VISIBLE(m_frameStatusBar->m_widget))
+            *height -= wxSTATUS_HEIGHT;
+#endif // wxUSE_STATUSBAR
+    }

 
 

-  gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
-    GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );
+#if wxUSE_TOOLBAR
+    // tool bar
+    if (m_frameToolBar &&
+        GTK_WIDGET_VISIBLE(m_frameToolBar->m_widget) && !m_toolBarDetached)
+    {
+        if (m_frameToolBar->IsVertical())
+        {
+            if (width)
+                *width -= m_frameToolBar->GetSize().x;
+        }
+        else
+        {
+            if (height)
+                *height -= m_frameToolBar->GetSize().y;
+        }
+    }
+#endif // wxUSE_TOOLBAR

 
 

-  m_mainWindow = gtk_myfixed_new();
-  gtk_widget_show( m_mainWindow );
-  GTK_WIDGET_UNSET_FLAGS( m_mainWindow, GTK_CAN_FOCUS );
+    if (width != NULL && *width < 0)
+        *width = 0;
+    if (height != NULL && *height < 0)
+        *height = 0;
+}

 
 

-  gtk_container_add( GTK_CONTAINER(m_widget), m_mainWindow );
-  gtk_widget_set_uposition( m_mainWindow, 0, 0 );
+bool wxFrame::ShowFullScreen(bool show, long style)
+{
+    if (!wxFrameBase::ShowFullScreen(show, style))
+        return false;
+
+    wxWindow* const bar[] = {
+#if wxUSE_MENUS
+        m_frameMenuBar,
+#else
+        NULL,
+#endif
+#if wxUSE_TOOLBAR
+        m_frameToolBar,
+#else
+        NULL,
+#endif
+#if wxUSE_STATUSBAR
+        m_frameStatusBar,
+#else
+        NULL,
+#endif
+    };
+    const long fsNoBar[] = {
+        wxFULLSCREEN_NOMENUBAR, wxFULLSCREEN_NOTOOLBAR, wxFULLSCREEN_NOSTATUSBAR
+    };
+    for (int i = 0; i < 3; i++)
+    {
+        if (show)
+        {
+            if (bar[i] && (style & fsNoBar[i]))
+            {
+                if (bar[i]->IsShown())
+                    bar[i]->Show(false);
+                else
+                    style &= ~fsNoBar[i];
+            }
+        }
+        else
+        {
+            if (bar[i] && (m_fsSaveFlag & fsNoBar[i]))
+                bar[i]->Show(true);
+        }
+    }
+    if (show)
+        m_fsSaveFlag = style;

 
 

-  m_wxwindow = gtk_myfixed_new();
-  gtk_widget_show( m_wxwindow );
-  GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
+    return true;
+}

 
 

-  gtk_container_add( GTK_CONTAINER(m_mainWindow), m_wxwindow );
+void wxFrame::GtkOnSize()
+{
+    // avoid recursions
+    if (m_resizing) return;
+    m_resizing = true;

 
 

-  gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
-    GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
+    // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow
+    wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );

 
 

-  gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
-    GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this );
-    
-  PostCreation();
+    // space occupied by m_frameToolBar and m_frameMenuBar
+    int client_area_x_offset = 0,
+        client_area_y_offset = 0;

 
 

-  gtk_widget_realize( m_mainWindow );
+    /* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses
+       wxWindow::Create to create it's GTK equivalent. m_mainWidget is only
+       set in wxFrame::Create so it is used to check what kind of frame we
+       have here. if m_mainWidget is NULL it is a wxMDIChildFrame and so we
+       skip the part which handles m_frameMenuBar, m_frameToolBar and (most
+       importantly) m_mainWidget */

 
 

-  return TRUE;
-}
+    ConstrainSize();

 
 

-wxFrame::~wxFrame()
-{
-  if (m_frameMenuBar) delete m_frameMenuBar;
-  if (m_frameStatusBar) delete m_frameStatusBar;
-  if (m_frameToolBar) delete m_frameToolBar;
+    int width, height;
+    GTKDoGetSize(&width, &height);

 
 

-//  if (m_mainWindow) gtk_widget_destroy( m_mainWindow );
+    if (m_mainWidget)
+    {
+        // TODO
+        // Rewrite this terrible code to using GtkVBox

 
 

-  wxTopLevelWindows.DeleteObject( this );
-  if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
-}
+        // m_mainWidget holds the menubar, the toolbar and the client
+        // area, which is represented by m_wxwindow.

 
 

-bool wxFrame::Show( bool show )
-{
-  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-  if (show)
-  {
-    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-    m_sizeSet = FALSE;
-    ProcessEvent( event );
-  }
-  return wxWindow::Show( show );
-}
+#if wxUSE_MENUS_NATIVE
+        int menubarHeight = 0;
+#endif

 
 

-void wxFrame::Enable( bool enable )
-{
-  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-  if (!m_mainWindow) return;
-  
-  wxWindow::Enable( enable );
-  gtk_widget_set_sensitive( m_mainWindow, enable );
-}
+#if wxUSE_MENUS_NATIVE
+        if (HasVisibleMenubar())
+        {
+            int xx = m_miniEdge;
+            int yy = m_miniEdge + m_miniTitle;
+            int ww = width - 2*m_miniEdge;
+            if (ww < 0)
+                ww = 0;
+            menubarHeight = m_menuBarHeight;
+            if (m_menuBarDetached) menubarHeight = wxPLACE_HOLDER;
+            m_frameMenuBar->m_x = xx;
+            m_frameMenuBar->m_y = yy;
+            m_frameMenuBar->m_width = ww;
+            m_frameMenuBar->m_height = menubarHeight;
+            gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
+                                  m_frameMenuBar->m_widget,
+                                  xx, yy, ww, menubarHeight);
+            client_area_y_offset += menubarHeight;
+        }
+#endif // wxUSE_MENUS_NATIVE
+
+#if wxUSE_TOOLBAR
+        if ((m_frameToolBar) && m_frameToolBar->IsShown() &&
+            (m_frameToolBar->m_widget->parent == m_mainWidget))
+        {
+            int xx = m_miniEdge;
+            int yy = m_miniEdge + m_miniTitle
+#if wxUSE_MENUS_NATIVE
+                        + menubarHeight
+#endif
+                        ;
+
+            m_frameToolBar->m_x = xx;
+            m_frameToolBar->m_y = yy;
+
+            // don't change the toolbar's reported height/width
+            int ww, hh;
+            if ( m_frameToolBar->GetWindowStyle() & wxTB_VERTICAL )
+            {
+                ww = m_toolBarDetached ? wxPLACE_HOLDER
+                                       : m_frameToolBar->m_width;
+                hh = height - 2*m_miniEdge;
+
+                client_area_x_offset += ww;
+            }
+            else if( m_frameToolBar->HasFlag(wxTB_RIGHT) )
+            {
+               yy += 2;
+               ww = m_toolBarDetached ? wxPLACE_HOLDER
+                                      : m_frameToolBar->m_width;
+               xx = GetClientSize().x - 1;
+               hh = height - 2*m_miniEdge;
+               if( hh < 0 )
+                  hh = 0;
+
+            }
+            else if( m_frameToolBar->GetWindowStyle() & wxTB_BOTTOM )
+            {
+                xx = m_miniEdge;
+                yy = GetClientSize().y;
+#if wxUSE_MENUS_NATIVE
+                yy += m_menuBarHeight;
+#endif // wxUSE_MENUS_NATIVE
+                m_frameToolBar->m_x = xx;
+                m_frameToolBar->m_y = yy;
+                ww = width - 2*m_miniEdge;
+                hh = m_toolBarDetached ? wxPLACE_HOLDER
+                                       : m_frameToolBar->m_height;
+            }
+            else
+            {
+                ww = width - 2*m_miniEdge;
+                hh = m_toolBarDetached ? wxPLACE_HOLDER
+                                       : m_frameToolBar->m_height;
+
+                client_area_y_offset += hh;
+            }
+
+            if (ww < 0)
+                ww = 0;
+            if (hh < 0)
+                hh = 0;
+            gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
+                                  m_frameToolBar->m_widget,
+                                  xx, yy, ww, hh );
+        }
+#endif // wxUSE_TOOLBAR
+
+        int client_x = client_area_x_offset + m_miniEdge;
+        int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;
+        int client_w = width - client_area_x_offset - 2*m_miniEdge;
+        int client_h = height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;
+        if (client_w < 0)
+            client_w = 0;
+        if (client_h < 0)
+            client_h = 0;
+        gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
+                              m_wxwindow,
+                              client_x, client_y, client_w, client_h );
+    }
+    else
+    {
+        // 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.
+    }

 
 

-void wxFrame::OnCloseWindow( wxCloseEvent &event )
-{
-  if (GetEventHandler()->OnClose() || event.GetForce()) this->Destroy();
-}
+#if wxUSE_STATUSBAR
+    if (m_frameStatusBar && m_frameStatusBar->IsShown())
+    {
+        int xx = 0 + m_miniEdge;
+        int yy = height - wxSTATUS_HEIGHT - m_miniEdge - client_area_y_offset;
+        int ww = width - 2*m_miniEdge;
+        if (ww < 0)
+            ww = 0;
+        int hh = wxSTATUS_HEIGHT;
+        m_frameStatusBar->m_x = xx;
+        m_frameStatusBar->m_y = yy;
+        m_frameStatusBar->m_width = ww;
+        m_frameStatusBar->m_height = hh;
+        gtk_pizza_set_size( GTK_PIZZA(m_wxwindow),
+                            m_frameStatusBar->m_widget,
+                            xx, yy, ww, hh );
+    }
+#endif // wxUSE_STATUSBAR

 
 

-bool wxFrame::Destroy()
-{
-  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
+    m_sizeSet = true;

 
 

-  return TRUE;
-}
+    // send size event to frame
+    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
+    event.SetEventObject( this );
+    GetEventHandler()->ProcessEvent( event );

 
 

-void wxFrame::ImplementSetPosition(void)
-{
-  if ((m_x != -1) || (m_y != -1))
-     gtk_widget_set_uposition( m_widget, m_x, m_y );
-}
+#if wxUSE_STATUSBAR
+    // send size event to status bar
+    if (m_frameStatusBar)
+    {
+        wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() );
+        event2.SetEventObject( m_frameStatusBar );
+        m_frameStatusBar->GetEventHandler()->ProcessEvent( event2 );
+    }
+#endif // wxUSE_STATUSBAR

 
 

-void wxFrame::Centre( int direction )
-{
-  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-  if (direction & wxHORIZONTAL == wxHORIZONTAL) m_x = (gdk_screen_width () - m_width) / 2;
-  if (direction & wxVERTICAL == wxVERTICAL) m_y = (gdk_screen_height () - m_height) / 2;
-  ImplementSetPosition();
+    m_resizing = false;

 }
 
 }
 

-void wxFrame::GetClientSize( int *width, int *height ) const
+void wxFrame::OnInternalIdle()

 {
 {

-  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-  wxWindow::GetClientSize( width, height );
-  if (height)
-  {
-    if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT;
-    if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
-    if (m_frameToolBar)
+    wxFrameBase::OnInternalIdle();
+
+#if wxUSE_MENUS_NATIVE
+    if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle();
+#endif // wxUSE_MENUS_NATIVE
+#if wxUSE_TOOLBAR
+    if (m_frameToolBar) m_frameToolBar->OnInternalIdle();
+#endif
+#if wxUSE_STATUSBAR
+    if (m_frameStatusBar)

     {
     {

-      int y = 0;
-      m_frameToolBar->GetSize( (int *) NULL, &y );
-      (*height) -= y;
+        m_frameStatusBar->OnInternalIdle();
+
+        // There may be controls in the status bar that
+        // need to be updated
+        for ( wxWindowList::compatibility_iterator node = m_frameStatusBar->GetChildren().GetFirst();
+          node;
+          node = node->GetNext() )
+        {
+            wxWindow *child = node->GetData();
+            child->OnInternalIdle();
+        }

     }
     }

-  }
+#endif

 }
 
 }
 

-void wxFrame::SetClientSize( int const width, int const height )
-{
-  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-  int h = height;
-  if (m_frameMenuBar) h += wxMENU_HEIGHT;
-  if (m_frameStatusBar) h += wxSTATUS_HEIGHT;
-  if (m_frameToolBar)
-  {
-    int y = 0;
-    m_frameToolBar->GetSize( (int *) NULL, &y );
-    h += y;
-  }
-  wxWindow::SetClientSize( width, h );
-}
+// ----------------------------------------------------------------------------
+// menu/tool/status bar stuff
+// ----------------------------------------------------------------------------

 
 

-void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
-{
-  // due to a bug in gtk, x,y are always 0
-  // m_x = x;
-  // m_y = y;
-
-  if ((m_height == height) && (m_width == width) &&
-      (m_sizeSet)) return;
-  if (!m_mainWindow) return;
-  if (!m_wxwindow) return;
-
-  m_width = width;
-  m_height = height;
-  if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
-  if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
-  if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth;
-  if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
-
-  gtk_widget_set_usize( m_widget, width, height );
-
-  int main_x = 0;
-  int main_y = 0;
-  int main_height = height;
-  int main_width = width;
-
-  // This emulates Windows behaviour:
-  // The menu bar is part of the main window, but the status bar
-  // is on the implementation side in the client area. The
-  // function GetClientSize returns the size of the client area
-  // minus the status bar height. Under wxGTK, the main window
-  // is represented by m_mainWindow. The menubar is inserted
-  // into m_mainWindow whereas the statusbar is insertes into
-  // m_wxwindow just like any other window.
-
-//  not really needed
-//  gtk_widget_set_usize( m_mainWindow, width, height );
-
-  if (m_frameMenuBar)
-  {
-    main_y = wxMENU_HEIGHT;
-    main_height -= wxMENU_HEIGHT;
-  }
-
-  int toolbar_height = 0;
-  if (m_frameToolBar) m_frameToolBar->GetSize( (int *) NULL, &toolbar_height );
-  
-  main_y += toolbar_height;
-  main_height -= toolbar_height;
-  
-  gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), m_wxwindow, main_x, main_y );
-  gtk_widget_set_usize( m_wxwindow, main_width, main_height );
-
-  if (m_frameMenuBar)
-  {
-    gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), m_frameMenuBar->m_widget, 1, 1 );
-    gtk_widget_set_usize( m_frameMenuBar->m_widget, width-2, wxMENU_HEIGHT-2 );
-  }
-
-  if (m_frameToolBar)
-  {
-    int y = 0;
-    if (m_frameMenuBar) y = wxMENU_HEIGHT;
-    gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), m_frameToolBar->m_widget, 1, y );
-    gtk_widget_set_usize( m_frameToolBar->m_widget, width-2, toolbar_height );
-  }
-  
-  if (m_frameStatusBar)
-  {
-    m_frameStatusBar->SetSize( 0, main_height-wxSTATUS_HEIGHT, width, wxSTATUS_HEIGHT );
-  }
-
-  m_sizeSet = TRUE;
-
-  wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-  event.SetEventObject( this );
-  ProcessEvent( event );
-}
+#if wxUSE_MENUS_NATIVE

 
 

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

 {
 {

-  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-  if ( GetAutoLayout() )
-    Layout();
-  else {
-    // 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())
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+    wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
+
+    if ( m_frameMenuBar )

     {
     {

-      wxWindow *win = (wxWindow *)node->Data();
-      if (!IS_KIND_OF(win,wxFrame) && !IS_KIND_OF(win,wxDialog)
-#if 0  // not in m_children anyway
-          && (win != m_frameMenuBar) &&
-             (win != m_frameToolBar) &&
-             (win != m_frameStatusBar)
-#endif
-         )
-      {
-        if ( child )  // it's the second one: do nothing
-          return;
+        m_frameMenuBar->UnsetInvokingWindow( this );

 
 

-        child = win;
-      }
-    }
+        if (m_frameMenuBar->GetWindowStyle() & wxMB_DOCKABLE)
+        {
+            g_signal_handlers_disconnect_by_func (m_frameMenuBar->m_widget,
+                    (gpointer) gtk_menu_attached_callback,
+                    this);

 
 

-    // yes: set it's size to fill all the frame
-    int client_x, client_y;
-    GetClientSize(&client_x, &client_y);
-    child->SetSize( 1, 1, client_x-2, client_y);
-  }
-}
+            g_signal_handlers_disconnect_by_func (m_frameMenuBar->m_widget,
+                    (gpointer) gtk_menu_detached_callback,
+                    this);
+        }

 
 

-void wxFrame::AddChild( wxWindow *child )
-{
-  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" );
-  wxASSERT_MSG( (m_mainWindow != NULL), "invalid frame" );
-  wxASSERT_MSG( (child != NULL),  "invalid child" );
-  wxASSERT_MSG( (child->m_widget != NULL), "invalid child" );
-  
-  // wxFrame and wxDialog as children aren't placed into the parents
-  
-  if (IS_KIND_OF(child,wxMDIChildFrame)) wxFAIL_MSG( "wxFrame::AddChild error.\n" );
-  
-  if ( IS_KIND_OF(child,wxFrame) || IS_KIND_OF(child,wxDialog))
-  {
-    m_children.Append( child );
-    
-    if ((child->m_x != -1) && (child->m_y != -1))
-      gtk_widget_set_uposition( child->m_widget, child->m_x, child->m_y );
-      
-    return;
-  }
-  
-  if (m_addPrivateChild)
-  {
-    gtk_myfixed_put( GTK_MYFIXED(m_mainWindow), child->m_widget, child->m_x, child->m_y );
-      
-    gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height );
-  }
-  else
-  {
-    m_children.Append( child );
-    
-    if (m_wxwindow)
-      gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), child->m_widget, child->m_x, child->m_y );
-      
-    gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height );
-  }    
-}
+        gtk_widget_ref( m_frameMenuBar->m_widget );

 
 

-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();
-  }
+        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), "invalid frame" );
-  wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" );
-  wxASSERT_MSG( (m_mainWindow != NULL), "invalid frame" );
-  
-  m_frameMenuBar = menuBar;
-  
-  if (m_frameMenuBar)
-  {
-    wxNode *node = m_frameMenuBar->m_menus.First();
-    while (node)
+    wxFrameBase::AttachMenuBar(menuBar);
+
+    if (m_frameMenuBar)

     {
     {

-      wxMenu *menu = (wxMenu*)node->Data();
-      SetInvokingWindow( menu, this );
-      node = node->Next();
+        m_frameMenuBar->SetInvokingWindow( this );
+
+        m_frameMenuBar->SetParent(this);
+        gtk_pizza_put( GTK_PIZZA(m_mainWidget),
+                m_frameMenuBar->m_widget,
+                m_frameMenuBar->m_x,
+                m_frameMenuBar->m_y,
+                m_frameMenuBar->m_width,
+                m_frameMenuBar->m_height );
+
+        if (menuBar->GetWindowStyle() & wxMB_DOCKABLE)
+        {
+            g_signal_connect (menuBar->m_widget, "child_attached",
+                              G_CALLBACK (gtk_menu_attached_callback),
+                              this);
+            g_signal_connect (menuBar->m_widget, "child_detached",
+                              G_CALLBACK (gtk_menu_detached_callback),
+                              this);
+        }
+
+        gtk_widget_show( m_frameMenuBar->m_widget );
+
+        UpdateMenuBarSize();

     }
     }

-    
-    if (m_frameMenuBar->m_parent != this)
+    else

     {
     {

-      m_frameMenuBar->m_parent = this;
-      gtk_myfixed_put( GTK_MYFIXED(m_mainWindow),
-        m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
+        m_menuBarHeight = 2;
+        GtkUpdateSize();        // resize window in OnInternalIdle

     }
     }

-  }

 }
 
 }
 

-wxMenuBar *wxFrame::GetMenuBar(void) const
+void wxFrame::UpdateMenuBarSize()

 {
 {

-  return m_frameMenuBar;
-}
+    m_menuBarHeight = 2;

 
 

-wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
-{
-  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-  wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" );
-
-  m_addPrivateChild = TRUE;
-  m_frameToolBar = OnCreateToolBar( style, id, name );
-  m_addPrivateChild = FALSE;
-  
-  return m_frameToolBar;
+    // this is called after Remove with a NULL m_frameMenuBar
+    if ( m_frameMenuBar )
+    {
+        GtkRequisition req;
+        gtk_widget_ensure_style(m_frameMenuBar->m_widget);
+        // have to call class method directly because
+        // "size_request" signal is overridden by wx
+        GTK_WIDGET_GET_CLASS(m_frameMenuBar->m_widget)->size_request(
+            m_frameMenuBar->m_widget, &req);
+
+        m_menuBarHeight = req.height;
+    }
+
+    // resize window in OnInternalIdle
+    GtkUpdateSize();

 }
 
 }
 

-wxToolBar* wxFrame::OnCreateToolBar( long style, wxWindowID id, const wxString& name )
+bool wxFrame::HasVisibleMenubar() const

 {
 {

-  return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name );
+    return m_frameMenuBar && m_frameMenuBar->IsShown();

 }
 }

+#endif // wxUSE_MENUS_NATIVE

 
 

-wxToolBar *wxFrame::GetToolBar(void) const 
-{ 
-  return m_frameToolBar; 
-}
+#if wxUSE_TOOLBAR

 
 

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

 {
 {

-  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-  wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" );
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

 
 

-  m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
-  
-  return m_frameStatusBar;
+    InsertChildFunction save = m_insertCallback;
+    m_insertCallback = wxInsertChildInFrame;
+    m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name );
+    m_insertCallback = save;
+
+    GtkUpdateSize();
+
+    return m_frameToolBar;

 }
 
 }
 

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

 {
 {

-  wxStatusBar *statusBar = (wxStatusBar *) NULL;
-    
-  statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20), style, name);
-    
-  // Set the height according to the font and the border size
-  wxClientDC dc(statusBar);
-  dc.SetFont( *statusBar->GetFont() );
+    bool hadTbar = m_frameToolBar != NULL;

 
 

-  long x, y;
-  dc.GetTextExtent( "X", &x, &y );
+    wxFrameBase::SetToolBar(toolbar);

 
 

-  int height = (int)( (y  * 1.1) + 2* statusBar->GetBorderY());
+    if ( m_frameToolBar )
+    {
+        // insert into toolbar area if not already there
+        if ((m_frameToolBar->m_widget->parent) &&
+            (m_frameToolBar->m_widget->parent != m_mainWidget))
+        {
+            GetChildren().DeleteObject( m_frameToolBar );
+
+            gtk_widget_reparent( m_frameToolBar->m_widget, m_mainWidget );
+            GtkUpdateSize();
+        }
+    }
+    else // toolbar unset
+    {
+        // still need to update size if it had been there before
+        if ( hadTbar )
+        {
+            GtkUpdateSize();
+        }
+    }
+}

 
 

-  statusBar->SetSize( -1, -1, 100, height );
+#endif // wxUSE_TOOLBAR

 
 

-  statusBar->SetFieldsCount( number );
-  return statusBar;
-}
+#if wxUSE_STATUSBAR

 
 

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

 {
 {

-  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-  wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+
+    // because it will change when toolbar is added
+    GtkUpdateSize();

 
 

-  m_frameStatusBar->SetStatusText(text, number);
+    return wxFrameBase::CreateStatusBar( number, style, id, name );

 }
 
 }
 

-void wxFrame::SetStatusWidths(int n, const int widths_field[] )
+void wxFrame::SetStatusBar(wxStatusBar *statbar)

 {
 {

-  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-  wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
+    bool hadStatBar = m_frameStatusBar != NULL;

 
 

-  m_frameStatusBar->SetStatusWidths(n, widths_field);
-}
+    wxFrameBase::SetStatusBar(statbar);

 
 

-wxStatusBar *wxFrame::GetStatusBar(void) const
-{
-  return m_frameStatusBar;
+    if (hadStatBar && !m_frameStatusBar)
+        GtkUpdateSize();

 }
 
 }
 

-void wxFrame::SetTitle( const wxString &title )
+void wxFrame::PositionStatusBar()

 {
 {

-  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-  m_title = title;
-  if (m_title.IsNull()) m_title = "";
-  gtk_window_set_title( GTK_WINDOW(m_widget), title );
-}
+    if ( !m_frameStatusBar )
+        return;

 
 

-void wxFrame::SetIcon( const wxIcon &icon )
-{
-  wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
-  m_icon = icon;
-  if (!icon.Ok()) return;
-  
-  wxMask *mask = icon.GetMask();
-  GdkBitmap *bm = (GdkBitmap *) NULL;
-  if (mask) bm = mask->GetBitmap();
-  
-  gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
+    GtkUpdateSize();

 }
 }

+#endif // wxUSE_STATUSBAR