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

fixed setting/attaching menubar

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-14 02:02:58 +00:00
parent 491c9920d0
commit f008af1635
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/frame.cpp
View File

@@ -481,7 +481,7 @@ void wxFrameMSW::PositionStatusBar()
void wxFrameMSW::AttachMenuBar(wxMenuBar *menubar) void wxFrameMSW::AttachMenuBar(wxMenuBar *menubar)
{ {
m_frameMenuBar = menubar; wxFrameBase::AttachMenuBar(menubar);
if ( !menubar ) if ( !menubar )
{ {
@@ -496,15 +496,15 @@ void wxFrameMSW::AttachMenuBar(wxMenuBar *menubar)
{ {
m_hMenu = menubar->GetHMenu(); m_hMenu = menubar->GetHMenu();
} }
else else // no HMENU yet
{ {
if ( menubar->IsAttached() )
menubar->Detach();
m_hMenu = menubar->Create(); m_hMenu = menubar->Create();
if ( !m_hMenu ) if ( !m_hMenu )
{
wxFAIL_MSG( _T("failed to create menu bar") );
return; return;
}
} }
InternalSetMenuBar(); InternalSetMenuBar();