Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for crash when the child has no menu

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-09-30 16:33:15 +00:00
parent c10d3a5471
commit 147d666989
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gtk/mdi.cpp
View File

@@ -168,15 +168,18 @@ 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 */ /* need to set the menubar of the child */
wxMDIChildFrame *active_child_frame = GetActiveChild(); wxMDIChildFrame *active_child_frame = GetActiveChild();
wxMenuBar *menu_bar = active_child_frame->m_menuBar; wxMenuBar *menu_bar = active_child_frame->m_menuBar;
menu_bar->m_width = m_width; if (menu_bar)
menu_bar->m_height = wxMENU_HEIGHT; {
gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), menu_bar->m_width = m_width;
menu_bar->m_widget, menu_bar->m_height = wxMENU_HEIGHT;
0, 0, m_width, wxMENU_HEIGHT ); gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
menu_bar->SetInvokingWindow(active_child_frame); menu_bar->m_widget,
0, 0, m_width, wxMENU_HEIGHT );
menu_bar->SetInvokingWindow(active_child_frame);
}
m_justInserted = false; m_justInserted = false;
return; return;

17
src/gtk1/mdi.cpp
View File

@@ -168,15 +168,18 @@ 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 */ /* need to set the menubar of the child */
wxMDIChildFrame *active_child_frame = GetActiveChild(); wxMDIChildFrame *active_child_frame = GetActiveChild();
wxMenuBar *menu_bar = active_child_frame->m_menuBar; wxMenuBar *menu_bar = active_child_frame->m_menuBar;
menu_bar->m_width = m_width; if (menu_bar)
menu_bar->m_height = wxMENU_HEIGHT; {
gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), menu_bar->m_width = m_width;
menu_bar->m_widget, menu_bar->m_height = wxMENU_HEIGHT;
0, 0, m_width, wxMENU_HEIGHT ); gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
menu_bar->SetInvokingWindow(active_child_frame); menu_bar->m_widget,
0, 0, m_width, wxMENU_HEIGHT );
menu_bar->SetInvokingWindow(active_child_frame);
}
m_justInserted = false; m_justInserted = false;
return; return;