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

prevent disappearing menus in tabmdi

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@44783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Benjamin Williams
2007-03-12 13:52:34 +00:00
parent 17865d5407
commit 6ecfa38fff
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/aui/auibook.cpp
View File

@@ -2599,7 +2599,8 @@ bool wxAuiNotebook::InsertPage(size_t page_idx,
// select is false, it must become the "current page" // select is false, it must become the "current page"
// (though no select events will be fired) // (though no select events will be fired)
if (!select && m_tabs.GetPageCount() == 1) if (!select && m_tabs.GetPageCount() == 1)
m_curpage = GetPageIndex(page); select = true;
//m_curpage = GetPageIndex(page);
wxAuiTabCtrl* active_tabctrl = GetActiveTabCtrl(); wxAuiTabCtrl* active_tabctrl = GetActiveTabCtrl();
if (page_idx >= active_tabctrl->GetPageCount()) if (page_idx >= active_tabctrl->GetPageCount())

5
src/aui/tabmdi.cpp
View File

@@ -177,7 +177,10 @@ void wxAuiMDIParentFrame::SetChildMenuBar(wxAuiMDIChildFrame* pChild)
if (!pChild) if (!pChild)
{ {
// No Child, set Our menu bar back. // No Child, set Our menu bar back.
SetMenuBar(m_pMyMenuBar); if (m_pMyMenuBar)
SetMenuBar(m_pMyMenuBar);
else
SetMenuBar(GetMenuBar());
// Make sure we know our menu bar is in use // Make sure we know our menu bar is in use
m_pMyMenuBar = NULL; m_pMyMenuBar = NULL;