AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch [ 1314868 ] [wxMSW] Show MDI child menubars when ShowFullScreen(false)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2005-10-23 11:05:46 +00:00
parent 3d3afaecfb
commit bc88602a65
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/msw/frame.cpp
View File

@ -518,8 +518,27 @@ bool wxFrame::ShowFullScreen(bool show, long style)
}
#endif // wxUSE_TOOLBAR
if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && m_hMenu)
::SetMenu(GetHwnd(), (HMENU)m_hMenu);
if (m_fsStyle & wxFULLSCREEN_NOMENUBAR)
{
WXHMENU menu = m_hMenu;
#if wxUSE_MDI_ARCHITECTURE
wxMDIParentFrame *frame = wxDynamicCast(this, wxMDIParentFrame);
if (frame)
{
wxMDIChildFrame *child = frame->GetActiveChild();
if (child)
{
menu = child->GetWinMenu();
}
}
#endif // wxUSE_MDI_ARCHITECTURE
if (menu)
{
::SetMenu(GetHwnd(), (HMENU)menu);
}
}
#if wxUSE_STATUSBAR
wxStatusBar *theStatusBar = GetStatusBar();
@ -954,7 +973,7 @@ WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPara
SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo;
if (info)
SHHandleWMActivate(GetHwnd(), wParam, lParam, info, FALSE);
// This implicitly sends a wxEVT_ACTIVATE_APP event
if (wxTheApp)
wxTheApp->SetActive(wParam != 0, FindFocus());