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

use a virtual function instead of wxDynamicCast(wxMDIParentFrame) in wxFrame code: this not only makes the code cleaner but should also remove the last dependency on MDI code when linking wx applications not using MDI

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-26 23:18:47 +00:00
parent 9089cffbf5
commit 51181d2911
4 changed files with 66 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/msw/frame.cpp
View File

@@ -580,24 +580,9 @@ bool wxFrame::ShowFullScreen(bool show, long style)
#if wxUSE_MENUS
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);
}
const WXHMENU hmenu = MSWGetActiveMenu();
if ( hmenu )
::SetMenu(GetHwnd(), (HMENU)hmenu);
}
#endif // wxUSE_MENUS