fix menu switching between children
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -164,6 +164,16 @@ void wxMDIParentFrame::OnInternalIdle()
|
|||||||
GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
|
GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
|
||||||
gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 );
|
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;
|
m_justInserted = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@@ -164,6 +164,16 @@ void wxMDIParentFrame::OnInternalIdle()
|
|||||||
GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
|
GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
|
||||||
gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 );
|
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;
|
m_justInserted = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user