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

first pass of wxUniv merge - nothing works, most parts don't even compile

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-26 20:59:19 +00:00
parent aeb313f31c
commit 1e6feb95a7
409 changed files with 42065 additions and 6675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/msw/mdi.cpp
View File

@@ -270,19 +270,20 @@ wxMDIParentFrame::~wxMDIParentFrame()
}
}
#if wxUSE_MENUS_NATIVE
void wxMDIParentFrame::InternalSetMenuBar()
{
// HMENU subMenu = GetSubMenu((HMENU) m_windowMenu, 0);
m_parentFrameActive = TRUE;
HMENU subMenu = (HMENU) 0;
if (GetWindowMenu())
subMenu = (HMENU) GetWindowMenu()->GetHMenu();
wxMenu *menu = GetWindowMenu();
HMENU subMenu = menu ? GetHmenuOf(menu) : 0;
InsertWindowMenu(GetClientWindow(), m_hMenu, subMenu);
}
#endif // wxUSE_MENUS_NATIVE
void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
{
if (m_windowMenu)