Add some version checks to help compiling on OSX.

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index e78e9679b6b8ad2376e4a9d55221b1d5a6e20455..37272e7b0bffa32ae5f234c36606b282236ba049 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -1,355 +1,404 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// 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/gtk/win_gtk.h"
-
-const wxMENU_HEIGHT    = 28;
-const wxSTATUS_HEIGHT  = 25;

 
 

-extern wxList wxTopLevelWindows;
-extern wxList wxPendingDelete;
+#ifndef WX_PRECOMP
+    #include "wx/menu.h"
+    #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
+#endif // WX_PRECOMP

 
 

-//-----------------------------------------------------------------------------
-// wxFrame
-//-----------------------------------------------------------------------------
+#include <gtk/gtk.h>

 
 

-//-----------------------------------------------------------------------------
-// size
+#if wxUSE_LIBHILDON
+    #include <hildon-widgets/hildon-window.h>
+#endif // wxUSE_LIBHILDON

 
 

-void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
-{
-  if (!win->HasVMT()) return;
+#if wxUSE_LIBHILDON2
+    #include <hildon/hildon.h>
+#endif // wxUSE_LIBHILDON2

 
 

-/*
-  printf( "OnFrameResize from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------

 
 

-  win->GtkOnSize( alloc->width, alloc->height );
-};
+// ============================================================================
+// implementation
+// ============================================================================

 
 

-//-----------------------------------------------------------------------------
-// delete
+// ----------------------------------------------------------------------------
+// wxFrame creation
+// ----------------------------------------------------------------------------

 
 

-bool gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win )
+void wxFrame::Init()

 {
 {

-/*
-  printf( "OnDelete from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
-
-  win->Close();
+    m_fsSaveFlag = 0;
+}

 
 

-  return TRUE;
-};
+bool wxFrame::Create( wxWindow *parent,
+                      wxWindowID id,
+                      const wxString& title,
+                      const wxPoint& pos,
+                      const wxSize& sizeOrig,
+                      long style,
+                      const wxString &name )
+{
+    return wxFrameBase::Create(parent, id, title, pos, sizeOrig, style, name);
+}

 
 

-//-----------------------------------------------------------------------------
+wxFrame::~wxFrame()
+{
+    SendDestroyEvent();

 
 

-BEGIN_EVENT_TABLE(wxFrame, wxWindow)
-  EVT_CLOSE(wxFrame::OnCloseWindow)
-  EVT_SIZE(wxFrame::OnSize)
-END_EVENT_TABLE()
+    DeleteAllBars();
+}

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
+// ----------------------------------------------------------------------------
+// overridden wxWindow methods
+// ----------------------------------------------------------------------------

 
 

-wxFrame::wxFrame(void)
-{
-  m_doingOnSize = FALSE;
-  m_frameMenuBar = NULL;
-  m_frameStatusBar = NULL;
-  m_sizeSet = FALSE;
-  wxTopLevelWindows.Insert( this );
-};
-
-wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
+void wxFrame::DoGetClientSize( int *width, int *height ) const

 {
 {

-  m_sizeSet = FALSE;
-  Create( parent, id, title, pos, size, style, name );
-  wxTopLevelWindows.Insert( this );
-};
-
-bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
-{
-  m_needParent = FALSE;
-  m_mainWindow = NULL;
-  m_wxwindow = NULL;
-
-  PreCreation( parent, id, pos, size, style, name );
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

 
 

-  m_doingOnSize = FALSE;
+    wxFrameBase::DoGetClientSize(width, height);

 
 

-  m_title = title;
-
-  m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-  if ((size.x != -1) && (size.y != -1))
-    gtk_widget_set_usize( m_widget, m_width, m_height );
-  if ((pos.x != -1) && (pos.y != -1))
-    gtk_widget_set_uposition( m_widget, m_x, m_y );
+    if (height)
+    {
+#if wxUSE_MENUS_NATIVE
+        // menu bar
+        if (m_frameMenuBar && m_frameMenuBar->IsShown())
+        {
+            GtkRequisition req;
+            gtk_widget_size_request(m_frameMenuBar->m_widget, &req);
+#if !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
+            *height -= req.height;
+#endif
+        }
+#endif // wxUSE_MENUS_NATIVE
+
+#if wxUSE_STATUSBAR
+        // status bar
+        if (m_frameStatusBar && m_frameStatusBar->IsShown())
+            *height -= m_frameStatusBar->m_height;
+#endif // wxUSE_STATUSBAR
+    }
+
+#if wxUSE_TOOLBAR
+    // tool bar
+    if (m_frameToolBar && m_frameToolBar->IsShown())
+    {
+        GtkRequisition req;
+        gtk_widget_size_request(m_frameToolBar->m_widget, &req);
+        if (m_frameToolBar->IsVertical())
+        {
+            if (width)
+                *width -= req.width;
+        }
+        else
+        {
+            if (height)
+                *height -= req.height;
+        }
+    }
+#endif // wxUSE_TOOLBAR
+
+    if (width != NULL && *width < 0)
+        *width = 0;
+    if (height != NULL && *height < 0)
+        *height = 0;
+}

 
 

-  gtk_window_set_title( GTK_WINDOW(m_widget), title );
-  GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
+#if wxUSE_MENUS && wxUSE_ACCEL
+// Helper for wxCreateAcceleratorTableForMenuBar
+static void wxAddAccelerators(wxList& accelEntries, wxMenu* menu)
+{
+    size_t i;
+    for (i = 0; i < menu->GetMenuItems().GetCount(); i++)
+    {
+        wxMenuItem* item = (wxMenuItem*) menu->GetMenuItems().Item(i)->GetData();
+        if (item->GetSubMenu())
+        {
+            wxAddAccelerators(accelEntries, item->GetSubMenu());
+        }
+        else if (!item->GetItemLabel().IsEmpty())
+        {
+            wxAcceleratorEntry* entry = wxAcceleratorEntry::Create(item->GetItemLabel());
+            if (entry)
+            {
+                entry->Set(entry->GetFlags(), entry->GetKeyCode(), item->GetId());
+                accelEntries.Append((wxObject*) entry);
+            }
+        }
+    }
+}

 
 

-  gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL);
+// Create an accelerator table consisting of all the accelerators
+// from the menubar in the given menus
+static wxAcceleratorTable wxCreateAcceleratorTableForMenuBar(wxMenuBar* menuBar)
+{
+    wxList accelEntries;

 
 

-  gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
-    GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );
+    size_t i;
+    for (i = 0; i < menuBar->GetMenuCount(); i++)
+    {
+        wxAddAccelerators(accelEntries, menuBar->GetMenu(i));
+    }

 
 

-  m_mainWindow = gtk_myfixed_new();
-  gtk_widget_show( m_mainWindow );
-  GTK_WIDGET_UNSET_FLAGS( m_mainWindow, GTK_CAN_FOCUS );
+    size_t n = accelEntries.GetCount();

 
 

-  gtk_container_add( GTK_CONTAINER(m_widget), m_mainWindow );
-  gtk_widget_set_uposition( m_mainWindow, 0, 0 );
+    if (n == 0)
+        return wxAcceleratorTable();

 
 

-  m_wxwindow = gtk_myfixed_new();
-  gtk_widget_show( m_wxwindow );
-  GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
+    wxAcceleratorEntry* entries = new wxAcceleratorEntry[n];

 
 

-  gtk_container_add( GTK_CONTAINER(m_mainWindow), m_wxwindow );
+    for (i = 0; i < accelEntries.GetCount(); i++)
+    {
+        wxAcceleratorEntry* entry = (wxAcceleratorEntry*) accelEntries.Item(i)->GetData();
+        entries[i] = (*entry);
+        delete entry;

 
 

-  m_frameMenuBar = NULL;
-  m_frameStatusBar = NULL;
+    }

 
 

-  gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
-    GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
+    wxAcceleratorTable table(n, entries);
+    delete[] entries;

 
 

-  PostCreation();
+    return table;
+}
+#endif // wxUSE_MENUS && wxUSE_ACCEL

 
 

-  gtk_widget_realize( m_mainWindow );
+bool wxFrame::ShowFullScreen(bool show, long style)
+{
+    if (!wxFrameBase::ShowFullScreen(show, style))
+        return false;

 
 

-  return TRUE;
-};
+#if wxUSE_MENUS && wxUSE_ACCEL
+    if (show && GetMenuBar())
+    {
+        wxAcceleratorTable table(wxCreateAcceleratorTableForMenuBar(GetMenuBar()));
+        if (table.IsOk())
+            SetAcceleratorTable(table);
+    }
+#endif // wxUSE_MENUS && wxUSE_ACCEL
+
+    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;
+
+    return true;
+}

 
 

-wxFrame::~wxFrame(void)
+bool wxFrame::SendIdleEvents(wxIdleEvent& event)

 {
 {

-  if (m_frameMenuBar) delete m_frameMenuBar;
-  if (m_frameStatusBar) delete m_frameStatusBar;
+    bool needMore = wxFrameBase::SendIdleEvents(event);

 
 

-//  if (m_mainWindow) gtk_widget_destroy( m_mainWindow );
+#if wxUSE_MENUS
+    if (m_frameMenuBar && m_frameMenuBar->SendIdleEvents(event))
+        needMore = true;
+#endif
+#if wxUSE_TOOLBAR
+    if (m_frameToolBar && m_frameToolBar->SendIdleEvents(event))
+        needMore = true;
+#endif
+#if wxUSE_STATUSBAR
+    if (m_frameStatusBar && m_frameStatusBar->SendIdleEvents(event))
+        needMore = true;
+#endif

 
 

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

 
 

-bool wxFrame::Show( bool show )
-{
-  if (show)
-  {
-    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-    m_sizeSet = FALSE;
-    ProcessEvent( event );
-  };
-  return wxWindow::Show( show );
-};
-
-void wxFrame::Enable( bool enable )
-{
-  wxWindow::Enable( enable );
-  gtk_widget_set_sensitive( m_mainWindow, enable );
-};
+// ----------------------------------------------------------------------------
+// menu/tool/status bar stuff
+// ----------------------------------------------------------------------------

 
 

-void wxFrame::OnCloseWindow( wxCloseEvent& WXUNUSED(event) )
-{
-  this->Destroy();
-};
+#if wxUSE_MENUS_NATIVE

 
 

-bool wxFrame::Destroy(void)
+void wxFrame::DetachMenuBar()

 {
 {

-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+    wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );

 
 

-  return TRUE;
-}
-
-void wxFrame::GetClientSize( int *width, int *height ) const
-{
-  wxWindow::GetClientSize( width, height );
-  if (height)
-  {
-    if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT;
-    if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
-  };
-};
-
-void wxFrame::GtkOnSize( int width, int height )
-{
-  if ((m_height == height) && (m_width == width) &&
-      (m_sizeSet)) return;
-  if (!m_mainWindow) return;
-  if (!m_wxwindow) return;
-
-  m_width = width;
-  m_height = height;
-
-  gtk_widget_set_usize( m_widget, width, height );
-
-  int main_x = 0;
-  int main_y = 0;
-  int main_height = height;
-  int main_width = width;
-
-  // This emulates Windows behaviour:
-  // The menu bar is part of the main window, but the status bar
-  // is on the implementation side in the client area. The
-  // function GetClientSize returns the size of the client area
-  // minus the status bar height. Under wxGTK, the main window
-  // is represented by m_mainWindow. The menubar is inserted
-  // into m_mainWindow whereas the statusbar is insertes into
-  // m_wxwindow just like any other window.
-
-//  not really needed
-  gtk_widget_set_usize( m_mainWindow, width, height );
-
-  if (m_frameMenuBar)
-  {
-    main_y = wxMENU_HEIGHT;
-    main_height -= wxMENU_HEIGHT;
-  };
-
-  gtk_widget_set_uposition( GTK_WIDGET(m_wxwindow), main_x, main_y );
-  gtk_widget_set_usize( GTK_WIDGET(m_wxwindow), main_width, main_height );
-
-  if (m_frameMenuBar)
-  {
-    gtk_widget_set_uposition( m_frameMenuBar->m_widget, 1, 1 );
-    gtk_widget_set_usize( m_frameMenuBar->m_widget, width-2, wxMENU_HEIGHT-2 );
-  };
-
-  if (m_frameStatusBar)
-  {
-    m_frameStatusBar->SetSize( 0, main_height-wxSTATUS_HEIGHT, width, wxSTATUS_HEIGHT );
-  };
-
-  m_sizeSet = TRUE;
-
-  wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-  event.SetEventObject( this );
-  ProcessEvent( event );
-};
-
-void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
-{
-  if ( GetAutoLayout() )
-    Layout();
-  else {
-    // do we have exactly one child?
-    wxWindow *child = NULL;
-    for(wxNode *node = GetChildren()->First(); node; node = node->Next())
+    if ( m_frameMenuBar )

     {
     {

-      wxWindow *win = (wxWindow *)node->Data();
-      if (!win->IsKindOf(CLASSINFO(wxFrame)) &&
-          !win->IsKindOf(CLASSINFO(wxDialog))
-#if 0 // not in m_children anyway
-          && (win != m_frameMenuBar) &&
-             (win != m_frameStatusBar)
-#endif
-         )
-      {
-        if ( child )  // it's the second one: do nothing
-          return;
-
-        child = win;
-      };
-    };
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+        hildon_window_set_menu(HILDON_WINDOW(m_widget), NULL);
+#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
+        g_object_ref( m_frameMenuBar->m_widget );

 
 

-    // 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);
-  }
-};
+        gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
+    }

 
 

-void SetInvokingWindow( wxMenu *menu, wxWindow *win )
-{
-  menu->SetInvokingWindow( win );
-  wxNode *node = menu->m_items.First();
-  while (node)
-  {
-    wxMenuItem *menuitem = (wxMenuItem*)node->Data();
-    if (menuitem->m_isSubMenu) SetInvokingWindow( menuitem->m_subMenu, win );
-    node = node->Next();
-  };
-};
-
-void wxFrame::SetMenuBar( wxMenuBar *menuBar )
-{
-  m_frameMenuBar = menuBar;
-
-  wxNode *node = m_frameMenuBar->m_menus.First();
-  while (node)
-  {
-    wxMenu *menu = (wxMenu*)node->Data();
-    SetInvokingWindow( menu, this );
-    node = node->Next();
-  };
-
-  m_frameMenuBar->m_parent = this;
-  gtk_myfixed_put( GTK_MYFIXED(m_mainWindow),
-    m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
-};
-
-bool wxFrame::CreateStatusBar( int number )
-{
-  if (m_frameStatusBar)
-  delete m_frameStatusBar;
-
-  m_frameStatusBar = new wxStatusBar( this, -1, wxPoint(0,0), wxSize(100,20) );
+    wxFrameBase::DetachMenuBar();

 
 

-  m_frameStatusBar->SetFieldsCount( number );
-  return TRUE;
-};
+    // make sure next size_allocate causes a wxSizeEvent
+    m_oldClientWidth = 0;
+}

 
 

-void wxFrame::SetStatusText( const wxString &text, int number )
+void wxFrame::AttachMenuBar( wxMenuBar *menuBar )

 {
 {

-  if (m_frameStatusBar) m_frameStatusBar->SetStatusText( text, number );
-};
+    wxFrameBase::AttachMenuBar(menuBar);

 
 

-void wxFrame::SetStatusWidths( int n, int *width )
-{
-  if (m_frameStatusBar) m_frameStatusBar->SetStatusWidths( n, width );
-};
+    if (m_frameMenuBar)
+    {
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+        hildon_window_set_menu(HILDON_WINDOW(m_widget),
+                               GTK_MENU(m_frameMenuBar->m_menubar));
+#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
+        m_frameMenuBar->SetParent(this);
+
+        // menubar goes into top of vbox (m_mainWidget)
+        gtk_box_pack_start(
+            GTK_BOX(m_mainWidget), menuBar->m_widget, false, false, 0);
+        gtk_box_reorder_child(GTK_BOX(m_mainWidget), menuBar->m_widget, 0);
+
+        // disconnect wxWindowGTK "size_request" handler,
+        // it interferes with sizing of detached GtkHandleBox
+        gulong handler_id = g_signal_handler_find(
+            menuBar->m_widget,
+            GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
+            g_signal_lookup("size_request", GTK_TYPE_WIDGET),
+            0, NULL, NULL, menuBar);
+        if (handler_id != 0)
+            g_signal_handler_disconnect(menuBar->m_widget, handler_id);
+
+        // reset size request to allow native sizing to work
+        gtk_widget_set_size_request(menuBar->m_widget, -1, -1);
+
+        gtk_widget_show( m_frameMenuBar->m_widget );
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
+    }
+    // make sure next size_allocate causes a wxSizeEvent
+    m_oldClientWidth = 0;
+}
+#endif // wxUSE_MENUS_NATIVE

 
 

-wxStatusBar *wxFrame::GetStatusBar(void)
-{
-  return m_frameStatusBar;
-};
+#if wxUSE_TOOLBAR

 
 

-wxMenuBar *wxFrame::GetMenuBar(void)
+void wxFrame::SetToolBar(wxToolBar *toolbar)

 {
 {

-  return m_frameMenuBar;
-};
+    m_frameToolBar = toolbar;
+    if (toolbar)
+    {
+        if (toolbar->IsVertical())
+        {
+            // Vertical toolbar and m_wxwindow go into an hbox, inside the
+            // vbox (m_mainWidget). hbox is created on demand.
+            GtkWidget* hbox = gtk_widget_get_parent(m_wxwindow);
+            if (!GTK_IS_HBOX(hbox))
+            {
+                hbox = gtk_hbox_new(false, 0);
+                gtk_widget_show(hbox);
+                gtk_container_add(GTK_CONTAINER(m_mainWidget), hbox);
+                gtk_widget_reparent(m_wxwindow, hbox);
+            }
+            gtk_widget_reparent(toolbar->m_widget, hbox);
+            gtk_box_set_child_packing(GTK_BOX(hbox),
+                toolbar->m_widget, false, false, 0, GTK_PACK_START);
+
+            int pos = 0;  // left
+            if (toolbar->HasFlag(wxTB_RIGHT))
+                pos = 1;  // right
+            gtk_box_reorder_child(GTK_BOX(hbox), toolbar->m_widget, pos);
+        }
+        else
+        {
+            // Horizontal toolbar goes into vbox (m_mainWidget)
+            gtk_widget_reparent(toolbar->m_widget, m_mainWidget);
+            gtk_box_set_child_packing(GTK_BOX(m_mainWidget),
+                toolbar->m_widget, false, false, 0, GTK_PACK_START);
+
+            int pos = 0;  // top
+            if (m_frameMenuBar)
+                pos = 1;  // below menubar
+            if (toolbar->HasFlag(wxTB_BOTTOM))
+                pos += 2;  // below client area (m_wxwindow)
+            gtk_box_reorder_child(
+                GTK_BOX(m_mainWidget), toolbar->m_widget, pos);
+        }
+
+        // disconnect wxWindowGTK "size_request" handler,
+        // it interferes with sizing of detached GtkHandleBox
+        gulong handler_id = g_signal_handler_find(
+            toolbar->m_widget,
+            GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
+            g_signal_lookup("size_request", GTK_TYPE_WIDGET),
+            0, NULL, NULL, toolbar);
+        if (handler_id != 0)
+            g_signal_handler_disconnect(toolbar->m_widget, handler_id);
+
+        // reset size request to allow native sizing to work
+        gtk_widget_set_size_request(toolbar->m_widget, -1, -1);
+    }
+    // make sure next size_allocate causes a wxSizeEvent
+    m_oldClientWidth = 0;
+}

 
 

-void wxFrame::SetTitle( const wxString &title )
-{
-  m_title = title;
-  gtk_window_set_title( GTK_WINDOW(m_widget), title );
-};
+#endif // wxUSE_TOOLBAR

 
 

-wxString wxFrame::GetTitle(void) const
-{
-  return (wxString&)m_title;
-};
+#if wxUSE_STATUSBAR

 
 

+void wxFrame::SetStatusBar(wxStatusBar *statbar)
+{
+    m_frameStatusBar = statbar;
+    if (statbar)
+    {
+        // statusbar goes into bottom of vbox (m_mainWidget)
+        gtk_widget_reparent(statbar->m_widget, m_mainWidget);
+        gtk_box_set_child_packing(GTK_BOX(m_mainWidget),
+            statbar->m_widget, false, false, 0, GTK_PACK_END);
+        // make sure next size_allocate on statusbar causes a size event
+        statbar->m_oldClientWidth = 0;
+    }
+    // make sure next size_allocate causes a wxSizeEvent
+    m_oldClientWidth = 0;
+}
+#endif // wxUSE_STATUSBAR