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

Consistently set wxMenuBar parent in all ports.

Browse Source 
Previously, wxGTK used the associated frame as wxMenuBar parent, while the
other ports did not. Do set the frame as menu bar parent in all ports now.

Of course, considering that wxMenuBar is not a window at all, this doesn't
necessarily make much sense, but at least it makes the behaviour consistent.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-05-04 23:59:37 +00:00
parent 4ed3f4abd8
commit ee05c45dff
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/menucmn.cpp
View File

@@ -925,6 +925,7 @@ void wxMenuBarBase::Attach(wxFrame *frame)
{ {
wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") ); wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") );
SetParent(frame);
m_menuBarFrame = frame; m_menuBarFrame = frame;
} }
@@ -933,6 +934,7 @@ void wxMenuBarBase::Detach()
wxASSERT_MSG( IsAttached(), wxT("detaching unattached menubar") ); wxASSERT_MSG( IsAttached(), wxT("detaching unattached menubar") );
m_menuBarFrame = NULL; m_menuBarFrame = NULL;
SetParent(NULL);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

1
src/gtk/frame.cpp
View File

@@ -304,7 +304,6 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
hildon_window_set_menu(HILDON_WINDOW(m_widget), hildon_window_set_menu(HILDON_WINDOW(m_widget),
GTK_MENU(m_frameMenuBar->m_widget)); GTK_MENU(m_frameMenuBar->m_widget));
#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 #else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
m_frameMenuBar->SetParent(this);
// menubar goes into top of vbox (m_mainWidget) // menubar goes into top of vbox (m_mainWidget)
gtk_box_pack_start( gtk_box_pack_start(