X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0fdaceeb177c53820baf2be167bd892d51d1a8c..f42b1601d6a55f3c2b7e7c22894727bda70d8505:/src/gtk/mdi.cpp diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index 5df3bbfd17..0b98599d59 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -12,6 +12,9 @@ #endif #include "wx/mdi.h" + +#if wxUSE_MDI_ARCHITECTURE + #include "wx/dialog.h" #include "wx/menu.h" #include @@ -27,6 +30,13 @@ const int wxMENU_HEIGHT = 27; +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //----------------------------------------------------------------------------- // globals //----------------------------------------------------------------------------- @@ -89,8 +99,9 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height ) menu_bar->m_y = 0; menu_bar->m_width = m_width; menu_bar->m_height = wxMENU_HEIGHT; - gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), menu_bar->m_widget, 0, 0 ); - gtk_widget_set_usize( menu_bar->m_widget, m_width, wxMENU_HEIGHT ); + gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), + menu_bar->m_widget, + 0, 0, m_width, wxMENU_HEIGHT ); } void wxMDIParentFrame::OnInternalIdle() @@ -112,23 +123,60 @@ void wxMDIParentFrame::OnInternalIdle() wxFrame::OnInternalIdle(); wxMDIChildFrame *active_child_frame = GetActiveChild(); + bool visible_child_menu = FALSE; - wxNode *node = m_clientWindow->m_children.First(); + wxNode *node = m_clientWindow->GetChildren().First(); while (node) { wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data(); + wxMenuBar *menu_bar = child_frame->m_menuBar; if (child_frame->m_menuBar) { if (child_frame == active_child_frame) - gtk_widget_show( child_frame->m_menuBar->m_widget ); + { + if (menu_bar->Show(TRUE)) + { + menu_bar->m_width = m_width; + menu_bar->m_height = wxMENU_HEIGHT; + gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), + menu_bar->m_widget, + 0, 0, m_width, wxMENU_HEIGHT ); + menu_bar->SetInvokingWindow( child_frame ); + } + visible_child_menu = TRUE; + } else - gtk_widget_hide( child_frame->m_menuBar->m_widget ); + { + if (menu_bar->Show(FALSE)) + { + menu_bar->UnsetInvokingWindow( child_frame ); + } + } } node = node->Next(); } /* show/hide parent menu bar as required */ - if (m_frameMenuBar) m_frameMenuBar->Show( (active_child_frame == NULL) ); + if ((m_frameMenuBar) && + (m_frameMenuBar->IsShown() == visible_child_menu)) + { + if (visible_child_menu) + { + m_frameMenuBar->Show( FALSE ); + m_frameMenuBar->UnsetInvokingWindow( this ); + } + else + { + m_frameMenuBar->Show( TRUE ); + m_frameMenuBar->SetInvokingWindow( this ); + + m_frameMenuBar->m_width = m_width; + m_frameMenuBar->m_height = wxMENU_HEIGHT; + gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), + m_frameMenuBar->m_widget, + 0, 0, m_width, wxMENU_HEIGHT ); + } + } } void wxMDIParentFrame::GetClientSize(int *width, int *height ) const @@ -153,7 +201,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const GtkNotebookPage* page = (GtkNotebookPage*) (g_list_nth(notebook->children,i)->data); if (!page) return (wxMDIChildFrame*) NULL; - wxNode *node = m_clientWindow->m_children.First(); + wxNode *node = m_clientWindow->GetChildren().First(); while (node) { wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data(); @@ -248,46 +296,22 @@ void wxMDIChildFrame::AddChild( wxWindow *child ) wxWindow::AddChild( child ); } -static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) -{ - menu->SetInvokingWindow( win ); - wxNode *node = menu->GetItems().First(); - while (node) - { - wxMenuItem *menuitem = (wxMenuItem*)node->Data(); - if (menuitem->IsSubMenu()) - SetInvokingWindow( menuitem->GetSubMenu(), win ); - node = node->Next(); - } -} - void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) { + wxASSERT_MSG( m_menuBar == NULL, _T("Only one menubar allowed") ); + m_menuBar = menu_bar; if (m_menuBar) { - wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent; - - if (m_menuBar->m_parent != this) - { - wxNode *node = m_menuBar->GetMenus().First(); - while (node) - { - wxMenu *menu = (wxMenu*)node->Data(); - SetInvokingWindow( menu, this ); - node = node->Next(); - } + wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent(); - m_menuBar->m_parent = mdi_frame; - } - - /* the menu bar of the child window is shown in idle time as needed */ - gtk_widget_hide( m_menuBar->m_widget ); + m_menuBar->SetParent( mdi_frame ); /* insert the invisible menu bar into the _parent_ mdi frame */ - gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_mainWidget), m_menuBar->m_widget, 0, 0 ); - gtk_widget_set_usize( menu_bar->m_widget, mdi_frame->m_width, wxMENU_HEIGHT ); + gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_mainWidget), + m_menuBar->m_widget, + 0, 0, mdi_frame->m_width, wxMENU_HEIGHT ); } } @@ -298,6 +322,17 @@ wxMenuBar *wxMDIChildFrame::GetMenuBar() const void wxMDIChildFrame::Activate() { +#if (GTK_MINOR_VERSION > 0) + wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent(); + GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget); + gint pageno = gtk_notebook_page_num( notebook, m_page->child ); + gtk_notebook_set_page( notebook, pageno ); +#else + // the only way I can see to do this under gtk+ 1.0.X would + // be to keep track of page numbers, start at first and + // do "next" enough times to get to this page number - messy + // - J. Russell Smyth +#endif } void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) ) @@ -310,6 +345,8 @@ void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) ) static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win ) { + if (g_isIdle) wxapp_install_idle_handler(); + if ((win->m_x == alloc->x) && (win->m_y == alloc->y) && (win->m_width == alloc->width) && @@ -331,7 +368,7 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil wxString s = child->m_title; if (s.IsNull()) s = _("MDI child"); - GtkWidget *label_widget = gtk_label_new( s ); + GtkWidget *label_widget = gtk_label_new( s.mbc_str() ); gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 ); gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate", @@ -343,7 +380,7 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data); - wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->m_parent; + wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->GetParent(); parent_frame->m_justInserted = TRUE; } @@ -372,15 +409,18 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style ) m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI; - PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" ); + if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) || + !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, _T("wxMDIClientWindow") )) + { + wxFAIL_MSG( _T("wxMDIClientWindow creation failed") ); + return FALSE; + } m_widget = gtk_notebook_new(); gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); - m_parent->AddChild( this ); - - (m_parent->m_insertCallback)( m_parent, this ); + m_parent->DoAddChild( this ); PostCreation(); @@ -389,5 +429,4 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style ) return TRUE; } - - +#endif