/////////////////////////////////////////////////////////////////////////////
-// Name: frame.cpp
+// Name: src/gtk/frame.cpp
// Purpose:
// Author: Robert Roebling
-// Created: 01/02/97
-// Id:
-// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// 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/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"
-#include "wx/gtk/win_gtk.h"
-
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-const int wxMENU_HEIGHT = 28;
-const int wxSTATUS_HEIGHT = 25;
-
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern wxList wxTopLevelWindows;
-extern wxList wxPendingDelete;
-
-//-----------------------------------------------------------------------------
-// "size_allocate"
-//-----------------------------------------------------------------------------
-
-static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
-{
- if (!win->HasVMT()) return;
-
-/*
- printf( "OnFrameResize from " );
- if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
- printf( win->GetClassInfo()->GetClassName() );
- printf( ".\n" );
-*/
- win->GtkOnSize( alloc->x, alloc->y, alloc->width, alloc->height );
-}
-
-//-----------------------------------------------------------------------------
-// "delete_event"
-//-----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+ #include "wx/menu.h"
+ #include "wx/toolbar.h"
+ #include "wx/statusbr.h"
+#endif // WX_PRECOMP
-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" );
-*/
+#include <gtk/gtk.h>
- win->Close();
-
- return TRUE;
-}
-
-//-----------------------------------------------------------------------------
-// "configure_event"
-//-----------------------------------------------------------------------------
-
-static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
-{
- if (!win->HasVMT()) return FALSE;
-
- win->m_x = event->x;
- win->m_y = event->y;
-
- return FALSE;
-}
+#if wxUSE_LIBHILDON
+ #include <hildon-widgets/hildon-window.h>
+#endif // wxUSE_LIBHILDON
-//-----------------------------------------------------------------------------
-// wxFrame
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------
-BEGIN_EVENT_TABLE(wxFrame, wxWindow)
- EVT_SIZE(wxFrame::OnSize)
- EVT_CLOSE(wxFrame::OnCloseWindow)
- EVT_IDLE(wxFrame::OnIdle)
-END_EVENT_TABLE()
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
-IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
+// ============================================================================
+// implementation
+// ============================================================================
-wxFrame::wxFrame()
-{
- 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 );
-}
+// ----------------------------------------------------------------------------
+// wxFrame creation
+// ----------------------------------------------------------------------------
-wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
- const wxPoint &pos, const wxSize &size,
- long style, const wxString &name )
+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_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;
-
- PreCreation( parent, id, pos, size, style, name );
-
- 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 );
-
- gtk_window_set_title( GTK_WINDOW(m_widget), title );
- 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_mainWindow = gtk_myfixed_new();
- gtk_widget_show( m_mainWindow );
- GTK_WIDGET_UNSET_FLAGS( m_mainWindow, GTK_CAN_FOCUS );
-
- gtk_container_add( GTK_CONTAINER(m_widget), m_mainWindow );
- gtk_widget_set_uposition( m_mainWindow, 0, 0 );
-
- 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_mainWindow), m_wxwindow );
-
- gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
- GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
-
- gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
- GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this );
-
- PostCreation();
-
- gtk_widget_realize( m_mainWindow );
-
- return TRUE;
+ return wxFrameBase::Create(parent, id, title, pos, sizeOrig, style, name);
}
wxFrame::~wxFrame()
{
- if (m_frameMenuBar) delete m_frameMenuBar;
- if (m_frameStatusBar) delete m_frameStatusBar;
- if (m_frameToolBar) delete m_frameToolBar;
-
-// if (m_mainWindow) gtk_widget_destroy( m_mainWindow );
-
- wxTopLevelWindows.DeleteObject( this );
- if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
+ m_isBeingDeleted = true;
+ DeleteAllBars();
}
-bool wxFrame::Show( bool show )
-{
- if (show)
- {
- wxSizeEvent event( wxSize(m_width,m_height), GetId() );
- m_sizeSet = FALSE;
- ProcessEvent( event );
- }
- return wxWindow::Show( show );
-}
+// ----------------------------------------------------------------------------
+// overridden wxWindow methods
+// ----------------------------------------------------------------------------
-void wxFrame::Enable( bool enable )
+void wxFrame::DoGetClientSize( int *width, int *height ) const
{
- wxWindow::Enable( enable );
- gtk_widget_set_sensitive( m_mainWindow, enable );
-}
+ wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
-void wxFrame::OnCloseWindow( wxCloseEvent &event )
-{
- if ( GetEventHandler()->OnClose() || event.GetForce())
+ wxFrameBase::DoGetClientSize(width, height);
+
+ if (height)
{
- this->Destroy();
+#if wxUSE_MENUS_NATIVE
+ // menu bar
+ if (m_frameMenuBar && m_frameMenuBar->IsShown())
+ {
+ GtkRequisition req;
+ gtk_widget_size_request(m_frameMenuBar->m_widget, &req);
+ *height -= req.height;
+ }
+#endif // wxUSE_MENUS_NATIVE
+
+#if wxUSE_STATUSBAR
+ // status bar
+ if (m_frameStatusBar && m_frameStatusBar->IsShown())
+ *height -= m_frameStatusBar->m_height;
+#endif // wxUSE_STATUSBAR
}
-}
-bool wxFrame::Destroy()
-{
- if (!wxPendingDelete.Member(this))
- wxPendingDelete.Append(this);
+#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
- return TRUE;
+ if (width != NULL && *width < 0)
+ *width = 0;
+ if (height != NULL && *height < 0)
+ *height = 0;
}
-void wxFrame::ImplementSetPosition(void)
+#if wxUSE_MENUS && wxUSE_ACCEL
+// Helper for wxCreateAcceleratorTableForMenuBar
+static void wxAddAccelerators(wxList& accelEntries, wxMenu* menu)
{
- if ((m_x != -1) || (m_y != -1))
- gtk_widget_set_uposition( m_widget, m_x, m_y );
+ 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);
+ }
+ }
+ }
}
-void wxFrame::Centre( int direction )
+// Create an accelerator table consisting of all the accelerators
+// from the menubar in the given menus
+static wxAcceleratorTable wxCreateAcceleratorTableForMenuBar(wxMenuBar* menuBar)
{
- 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();
-}
+ wxList accelEntries;
-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;
- if (m_frameToolBar)
+ size_t i;
+ for (i = 0; i < menuBar->GetMenuCount(); i++)
{
- int y = 0;
- m_frameToolBar->GetSize( (int *) NULL, &y );
- (*height) -= y;
+ wxAddAccelerators(accelEntries, menuBar->GetMenu(i));
}
- }
-}
-void wxFrame::SetClientSize( int const width, int const height )
-{
- 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 );
-}
+ size_t n = accelEntries.GetCount();
-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)
- {
- gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), m_frameToolBar->m_widget, 1, wxMENU_HEIGHT );
- 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 (n == 0)
+ return wxAcceleratorTable();
-void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
-{
- 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())
- {
- 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;
+ wxAcceleratorEntry* entries = new wxAcceleratorEntry[n];
- child = win;
- }
+ for (i = 0; i < accelEntries.GetCount(); i++)
+ {
+ wxAcceleratorEntry* entry = (wxAcceleratorEntry*) accelEntries.Item(i)->GetData();
+ entries[i] = (*entry);
+ delete entry;
+
}
- // 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);
- }
-}
+ wxAcceleratorTable table(n, entries);
+ delete[] entries;
-void wxFrame::AddChild( wxWindow *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 );
- }
+ return table;
}
+#endif // wxUSE_MENUS && wxUSE_ACCEL
-static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
+bool wxFrame::ShowFullScreen(bool show, long style)
{
- 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();
- }
-}
+ if (!wxFrameBase::ShowFullScreen(show, style))
+ return false;
-void wxFrame::SetMenuBar( wxMenuBar *menuBar )
-{
- m_frameMenuBar = menuBar;
-
- if (m_frameMenuBar)
- {
- wxNode *node = m_frameMenuBar->m_menus.First();
- while (node)
+#if wxUSE_MENUS && wxUSE_ACCEL
+ if (show && GetMenuBar())
{
- wxMenu *menu = (wxMenu*)node->Data();
- SetInvokingWindow( menu, this );
- node = node->Next();
+ wxAcceleratorTable table(wxCreateAcceleratorTableForMenuBar(GetMenuBar()));
+ if (table.IsOk())
+ SetAcceleratorTable(table);
}
-
- if (m_frameMenuBar->m_parent != this)
+#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++)
{
- m_frameMenuBar->m_parent = this;
- gtk_myfixed_put( GTK_MYFIXED(m_mainWindow),
- m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
+ 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;
-wxMenuBar *wxFrame::GetMenuBar(void) const
-{
- return m_frameMenuBar;
+ return true;
}
-wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
+void wxFrame::OnInternalIdle()
{
- wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" );
+ wxFrameBase::OnInternalIdle();
- m_addPrivateChild = TRUE;
- m_frameToolBar = OnCreateToolBar( style, id, name );
- m_addPrivateChild = FALSE;
-
- return m_frameToolBar;
+#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)
+ {
+ 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
}
-wxToolBar* wxFrame::OnCreateToolBar( long style, wxWindowID id, const wxString& name )
-{
- return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name );
-}
+// ----------------------------------------------------------------------------
+// menu/tool/status bar stuff
+// ----------------------------------------------------------------------------
-wxToolBar *wxFrame::GetToolBar(void) const
-{
- return m_frameToolBar;
-}
+#if wxUSE_MENUS_NATIVE
-wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
+void wxFrame::DetachMenuBar()
{
- wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" );
+ wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+ wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
- m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
-
- return m_frameStatusBar;
-}
-
-wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
-{
- 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() );
+ if ( m_frameMenuBar )
+ {
+#if wxUSE_LIBHILDON
+ hildon_window_set_menu(HILDON_WINDOW(m_widget), NULL);
+#else // !wxUSE_LIBHILDON
+ m_frameMenuBar->UnsetInvokingWindow( this );
- long x, y;
- dc.GetTextExtent( "X", &x, &y );
+ gtk_widget_ref( m_frameMenuBar->m_widget );
- int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY());
+ gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );
+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
+ }
- statusBar->SetSize( -1, -1, 100, height );
+ wxFrameBase::DetachMenuBar();
- statusBar->SetFieldsCount( number );
- return statusBar;
+ // make sure next size_allocate causes a wxSizeEvent
+ m_oldClientWidth = 0;
}
-void wxFrame::SetStatusText(const wxString& text, int number)
+void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
{
- wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
+ wxFrameBase::AttachMenuBar(menuBar);
- m_frameStatusBar->SetStatusText(text, number);
+ if (m_frameMenuBar)
+ {
+#if wxUSE_LIBHILDON
+ hildon_window_set_menu(HILDON_WINDOW(m_widget),
+ GTK_MENU(m_frameMenuBar->m_menubar));
+#else // !wxUSE_LIBHILDON
+ m_frameMenuBar->SetInvokingWindow( this );
+
+ 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_LIBHILDON
+ }
+ // make sure next size_allocate causes a wxSizeEvent
+ m_oldClientWidth = 0;
}
+#endif // wxUSE_MENUS_NATIVE
-void wxFrame::SetStatusWidths(int n, const int widths_field[] )
-{
- wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
+#if wxUSE_TOOLBAR
- m_frameStatusBar->SetStatusWidths(n, widths_field);
-}
-
-wxStatusBar *wxFrame::GetStatusBar(void) const
+void wxFrame::SetToolBar(wxToolBar *toolbar)
{
- return m_frameStatusBar;
+ 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 = m_wxwindow->parent;
+ 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;
- if (m_title.IsNull()) m_title = "";
- gtk_window_set_title( GTK_WINDOW(m_widget), title );
-}
+#endif // wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR
-void wxFrame::SetIcon( const wxIcon &icon )
+void wxFrame::SetStatusBar(wxStatusBar *statbar)
{
- 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 );
+ 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
projects / wxWidgets.git / blobdiff