From 1d608029081474c1a5b005451661fbfdcea39e80 Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Wed, 1 Sep 2004 13:39:17 +0000 Subject: [PATCH] fix menu switching between children git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/mdi.cpp | 10 ++++++++++ src/gtk1/mdi.cpp | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp index d2de112f36..f1006d4ca5 100644 --- a/src/gtk/mdi.cpp +++ b/src/gtk/mdi.cpp @@ -164,6 +164,16 @@ void wxMDIParentFrame::OnInternalIdle() GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget); gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 ); + /* need to set the menubar of the child */ + wxMDIChildFrame *active_child_frame = GetActiveChild(); + wxMenuBar *menu_bar = active_child_frame->m_menuBar; + menu_bar->m_width = m_width; + menu_bar->m_height = wxMENU_HEIGHT; + gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), + menu_bar->m_widget, + 0, 0, m_width, wxMENU_HEIGHT ); + menu_bar->SetInvokingWindow(active_child_frame); + m_justInserted = false; return; } diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp index d2de112f36..f1006d4ca5 100644 --- a/src/gtk1/mdi.cpp +++ b/src/gtk1/mdi.cpp @@ -164,6 +164,16 @@ void wxMDIParentFrame::OnInternalIdle() GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget); gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 ); + /* need to set the menubar of the child */ + wxMDIChildFrame *active_child_frame = GetActiveChild(); + wxMenuBar *menu_bar = active_child_frame->m_menuBar; + menu_bar->m_width = m_width; + menu_bar->m_height = wxMENU_HEIGHT; + gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), + menu_bar->m_widget, + 0, 0, m_width, wxMENU_HEIGHT ); + menu_bar->SetInvokingWindow(active_child_frame); + m_justInserted = false; return; } -- 2.45.2