X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5eafd0e55812155780cc9ec2910ac25fd1629e7..0c75b29e1ed19810546de38b646b5b901be873e2:/src/gtk/frame.cpp?ds=sidebyside diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 796b55629f..118148b185 100644 --- 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$ @@ -7,698 +7,405 @@ // 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/dcclient.h" - -#include "glib.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" -#include "wx/gtk/win_gtk.h" - -//----------------------------------------------------------------------------- -// constants -//----------------------------------------------------------------------------- - -const int wxMENU_HEIGHT = 27; -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" ); -*/ - - 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; - } -} -//----------------------------------------------------------------------------- -// "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" ); -*/ - - win->Close(); - - return TRUE; -} +#include -//----------------------------------------------------------------------------- -// "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; - - wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() ); - mevent.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( mevent ); - - return FALSE; -} +#if wxUSE_LIBHILDON + #include +#endif // wxUSE_LIBHILDON -//----------------------------------------------------------------------------- -// wxFrame -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// event tables +// ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxFrame, wxWindow) - EVT_SIZE(wxFrame::OnSize) - EVT_CLOSE(wxFrame::OnCloseWindow) - EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight) -END_EVENT_TABLE() +IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) -IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow) +// ============================================================================ +// implementation +// ============================================================================ -wxFrame::wxFrame() -{ - m_frameMenuBar = (wxMenuBar *) NULL; - m_mdiMenuBar = (wxMenuBar *) NULL; - m_frameStatusBar = (wxStatusBar *) NULL; - m_frameToolBar = (wxToolBar *) NULL; - m_sizeSet = FALSE; - m_miniEdge = 0; - m_miniTitle = 0; -} +// ---------------------------------------------------------------------------- +// 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_mdiMenuBar = (wxMenuBar *) NULL; - m_frameStatusBar = (wxStatusBar *) NULL; - m_frameToolBar = (wxToolBar *) NULL; - m_sizeSet = FALSE; - m_miniEdge = 0; - m_miniTitle = 0; - Create( parent, id, title, pos, size, style, name ); + 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 ) { - wxTopLevelWindows.Append( this ); - - m_needParent = FALSE; - - PreCreation( parent, id, pos, size, style, name ); - - m_title = title; - - GtkWindowType win_type = GTK_WINDOW_TOPLEVEL; - if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP; - - m_widget = gtk_window_new( win_type ); - -#ifdef __WXDEBUG__ - debug_focus_in( m_widget, "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_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); - - gtk_window_set_policy( GTK_WINDOW(m_widget), 1, 1, 0 ); - - gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", - GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this ); - - m_wxwindow = gtk_myfixed_new(); - gtk_widget_show( m_wxwindow ); - GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS ); - -#ifdef __WXDEBUG__ - debug_focus_in( m_wxwindow, "wxFrame::m_wxwindow", name ); -#endif - - gtk_container_add( GTK_CONTAINER(m_widget), 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 ); - - if (m_parent) m_parent->AddChild( this ); - - PostCreation(); - - return TRUE; + return wxFrameBase::Create(parent, id, title, pos, sizeOrig, style, name); } wxFrame::~wxFrame() { - if (m_frameMenuBar) delete m_frameMenuBar; - m_frameMenuBar = (wxMenuBar *) NULL; - - if (m_frameStatusBar) delete m_frameStatusBar; - m_frameStatusBar = (wxStatusBar *) NULL; - - if (m_frameToolBar) delete m_frameToolBar; - m_frameToolBar = (wxToolBar *) NULL; - - wxTopLevelWindows.DeleteObject( this ); - - 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" ); - - 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. */ - - GtkOnSize( m_x, m_y, m_width, m_height ); - } - - return wxWindow::Show( show ); -} - -bool wxFrame::Destroy() -{ - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); - - return TRUE; + m_isBeingDeleted = true; + DeleteAllBars(); } -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; -} +// ---------------------------------------------------------------------------- +// overridden wxWindow methods +// ---------------------------------------------------------------------------- -void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags ) +void wxFrame::DoGetClientSize( int *width, int *height ) const { - wxASSERT_MSG( (m_widget != NULL), "invalid window" ); - - /* Don't do anything for children of wxMDIChildFrame */ - if (!m_wxwindow) return; - - if (m_resizing) return; // I don't like recursions - m_resizing = TRUE; - - int old_x = m_x; - int old_y = m_y; - int old_width = m_width; - int old_height = m_height; - - if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING) - { - if (x != -1) m_x = x; - if (y != -1) m_y = y; - if (width != -1) m_width = width; - if (height != -1) m_height = height; - } - else - { - m_x = x; - m_y = y; - m_width = width; - m_height = height; - } + wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH) - { - if (width == -1) m_width = 80; - } + wxFrameBase::DoGetClientSize(width, height); - if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT) + if (height) { - if (height == -1) m_height = 26; - } - - if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth; - if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight; - if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth; - if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight; +#if 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 ((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 wxUSE_STATUSBAR + // status bar + if (m_frameStatusBar && m_frameStatusBar->IsShown()) + *height -= m_frameStatusBar->m_height; +#endif // wxUSE_STATUSBAR } - if ((m_width != old_width) || (m_height != old_height)) +#if wxUSE_TOOLBAR + // tool bar + if (m_frameToolBar && m_frameToolBar->IsShown()) { - m_sizeSet = FALSE; + 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 - m_resizing = FALSE; + if (width != NULL && *width < 0) + *width = 0; + if (height != NULL && *height < 0) + *height = 0; } -void wxFrame::SetSize( int width, int height ) +#if wxUSE_MENUS && wxUSE_ACCEL +// Helper for wxCreateAcceleratorTableForMenuBar +static void wxAddAccelerators(wxList& accelEntries, wxMenu* menu) { - SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING ); -} - -void wxFrame::Centre( int direction ) -{ - wxASSERT_MSG( (m_widget != NULL), "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; - - Move( x, y ); -} - -void wxFrame::GetClientSize( int *width, int *height ) const -{ - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - wxWindow::GetClientSize( width, height ); - if (height) + size_t i; + for (i = 0; i < menu->GetMenuItems().GetCount(); i++) { - if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT; - if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT; - if (m_frameToolBar) + wxMenuItem* item = (wxMenuItem*) menu->GetMenuItems().Item(i)->GetData(); + if (item->GetSubMenu()) { - int y = 0; - m_frameToolBar->GetSize( (int *) NULL, &y ); - (*height) -= y; + 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); + } } - (*height) -= m_miniEdge*2 + m_miniTitle; - } - if (width) - { - (*width) -= m_miniEdge*2; } } -void wxFrame::SetClientSize( int const width, int const height ) +// Create an accelerator table consisting of all the accelerators +// from the menubar in the given menus +static wxAcceleratorTable wxCreateAcceleratorTableForMenuBar(wxMenuBar* menuBar) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + wxList accelEntries; - int h = height; - if (m_frameMenuBar) h += wxMENU_HEIGHT; - if (m_frameStatusBar) h += wxSTATUS_HEIGHT; - if (m_frameToolBar) + size_t i; + for (i = 0; i < menuBar->GetMenuCount(); i++) { - int y = 0; - m_frameToolBar->GetSize( (int *) NULL, &y ); - h += y; + wxAddAccelerators(accelEntries, menuBar->GetMenu(i)); } - wxWindow::SetClientSize( width + m_miniEdge*2, h + m_miniEdge*2 + m_miniTitle ); -} - -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_resizing) return; - m_resizing = TRUE; - - 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_maxWidth; - if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight; + size_t n = accelEntries.GetCount(); - gtk_widget_set_usize( m_widget, m_width, m_height ); - gdk_window_resize( m_widget->window, m_width, m_height ); + if (n == 0) + return wxAcceleratorTable(); - // 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. + wxAcceleratorEntry* entries = new wxAcceleratorEntry[n]; - if (m_frameMenuBar) - { - 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 ); - } - - if (m_frameToolBar) - { - int xx = m_miniEdge; - int yy = m_miniEdge + m_miniTitle; - if ((m_frameMenuBar) || (m_mdiMenuBar)) 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 (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; - - 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 ); - } - - 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) + for (i = 0; i < accelEntries.GetCount(); i++) { - wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() ); - event2.SetEventObject( m_frameStatusBar ); - m_frameStatusBar->GetEventHandler()->ProcessEvent( event2 ); + wxAcceleratorEntry* entry = (wxAcceleratorEntry*) accelEntries.Item(i)->GetData(); + entries[i] = (*entry); + delete entry; + } - m_resizing = FALSE; -} + wxAcceleratorTable table(n, entries); + delete[] entries; -void wxFrame::OnInternalIdle() -{ - if (!m_sizeSet) - GtkOnSize( m_x, m_y, m_width, m_height ); - - DoMenuUpdates(); + return table; } +#endif // wxUSE_MENUS && wxUSE_ACCEL -void wxFrame::OnCloseWindow( wxCloseEvent& event ) +bool wxFrame::ShowFullScreen(bool show, long style) { - // close the window if it wasn't vetoed by the application -// if ( !event.GetVeto() ) // No, this isn't the interpretation of GetVeto. - Destroy(); -} + if (!wxFrameBase::ShowFullScreen(show, style)) + return false; -void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) ) -{ - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - if (GetAutoLayout()) +#if wxUSE_MENUS && wxUSE_ACCEL + if (show && GetMenuBar()) { - Layout(); + wxAcceleratorTable table(wxCreateAcceleratorTableForMenuBar(GetMenuBar())); + if (table.IsOk()) + SetAcceleratorTable(table); } - else - { - // no child: go out ! - if (!GetChildren().First()) return; +#endif // wxUSE_MENUS && wxUSE_ACCEL - // 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) + wxWindow* const bar[] = { +#if wxUSE_MENUS + m_frameMenuBar, +#else + NULL, #endif - ) - { - // it's the second one: do nothing - if (child) 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(); - } -} - -void wxFrame::SetMenuBar( wxMenuBar *menuBar ) -{ - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" ); - - m_frameMenuBar = menuBar; - - if (m_frameMenuBar) +#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++) { - wxNode *node = m_frameMenuBar->m_menus.First(); - while (node) + if (show) { - wxMenu *menu = (wxMenu*)node->Data(); - SetInvokingWindow( menu, this ); - node = node->Next(); + if (bar[i] && (style & fsNoBar[i])) + { + if (bar[i]->IsShown()) + bar[i]->Show(false); + else + style &= ~fsNoBar[i]; + } } - - if (m_frameMenuBar->m_parent != this) + else { - m_frameMenuBar->m_parent = this; - gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), - m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y ); - - /* an mdi child menu bar might be underneath */ - if (m_mdiMenuBar) m_frameMenuBar->Show( FALSE ); + if (bar[i] && (m_fsSaveFlag & fsNoBar[i])) + bar[i]->Show(true); } } + if (show) + m_fsSaveFlag = style; - m_sizeSet = FALSE; + return true; } -wxMenuBar *wxFrame::GetMenuBar() const +void wxFrame::OnInternalIdle() { - return m_frameMenuBar; -} + wxFrameBase::OnInternalIdle(); -void wxFrame::OnMenuHighlight(wxMenuEvent& event) -{ - if (GetStatusBar()) +#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) { - if (event.GetMenuId() == -1) - { - SetStatusText(""); - } - else + 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() ) { - wxMenuBar *menuBar = GetMenuBar(); - if (menuBar) - { - int menuId = event.GetMenuId(); - wxString helpString; - helpString = menuBar->GetHelpString(menuId); - if (helpString != "") - SetStatusText(helpString); - } + wxWindow *child = node->GetData(); + child->OnInternalIdle(); } } +#endif } -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" ); +// ---------------------------------------------------------------------------- +// menu/tool/status bar stuff +// ---------------------------------------------------------------------------- - m_frameToolBar = OnCreateToolBar( style, id, name ); - - GetChildren().DeleteObject( m_frameToolBar ); - - m_sizeSet = FALSE; - - return m_frameToolBar; -} - -wxToolBar* wxFrame::OnCreateToolBar( long style, wxWindowID id, const wxString& name ) -{ - return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name ); -} +#if wxUSE_MENUS_NATIVE -wxToolBar *wxFrame::GetToolBar() const +void wxFrame::DetachMenuBar() { - return m_frameToolBar; -} + wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); + wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") ); -wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name ) -{ - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); + if ( m_frameMenuBar ) + { +#if wxUSE_LIBHILDON + hildon_window_set_menu(HILDON_WINDOW(m_widget), NULL); +#else // !wxUSE_LIBHILDON + m_frameMenuBar->UnsetInvokingWindow( this ); - wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" ); + gtk_widget_ref( m_frameMenuBar->m_widget ); - m_frameStatusBar = OnCreateStatusBar( number, style, id, name ); + gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget ); +#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON + } - m_sizeSet = FALSE; + wxFrameBase::DetachMenuBar(); - return m_frameStatusBar; + // make sure next size_allocate causes a wxSizeEvent + m_oldClientWidth = 0; } -wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id, const wxString& name ) +void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) { - 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() ); + wxFrameBase::AttachMenuBar(menuBar); - long x, y; - dc.GetTextExtent( "X", &x, &y ); - - int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY()); - - statusBar->SetSize( -1, -1, 100, height ); - - statusBar->SetFieldsCount( number ); - return statusBar; + 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::SetStatusText(const wxString& text, int number) -{ - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" ); - - m_frameStatusBar->SetStatusText(text, number); -} +#if wxUSE_TOOLBAR -void wxFrame::SetStatusWidths(int n, const int widths_field[] ) +void wxFrame::SetToolBar(wxToolBar *toolbar) { - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); - - wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" ); - - m_frameStatusBar->SetStatusWidths(n, widths_field); -} + 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); + } -wxStatusBar *wxFrame::GetStatusBar() const -{ - return m_frameStatusBar; + // 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 ) -{ - wxASSERT_MSG( (m_widget != NULL), "invalid frame" ); +#endif // wxUSE_TOOLBAR - m_title = title; - if (m_title.IsNull()) m_title = ""; - gtk_window_set_title( GTK_WINDOW(m_widget), title ); -} +#if wxUSE_STATUSBAR -void wxFrame::SetIcon( const wxIcon &icon ) +void wxFrame::SetStatusBar(wxStatusBar *statbar) { - 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 ); + 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