Fixed compilation and
only does mdi tests when enabled in setup.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -36,6 +36,7 @@
|
|||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
#include "wx/intl.h"
|
#include "wx/intl.h"
|
||||||
#include "wx/log.h"
|
#include "wx/log.h"
|
||||||
|
#include "wx/mdi.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxUSE_OWNER_DRAWN
|
#if wxUSE_OWNER_DRAWN
|
||||||
@@ -1059,6 +1060,7 @@ wxMenu *wxMenuBar::Remove(size_t pos)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
#if wxUSE_MDI_ARCHITECTURE
|
||||||
//MDI - window menu stuff
|
//MDI - window menu stuff
|
||||||
if (GetFrame() && GetFrame()->IsKindOf(CLASSINFO(wxMDIParentFrame)))
|
if (GetFrame() && GetFrame()->IsKindOf(CLASSINFO(wxMDIParentFrame)))
|
||||||
{
|
{
|
||||||
@@ -1130,6 +1132,7 @@ wxMenu *wxMenuBar::Remove(size_t pos)
|
|||||||
}//end if child == wxMDIChildFrame
|
}//end if child == wxMDIChildFrame
|
||||||
}//end children iteration loop
|
}//end children iteration loop
|
||||||
}//end if GetFrame()->IsKindOf(CLASSINFO(wxMDIParentFrame))
|
}//end if GetFrame()->IsKindOf(CLASSINFO(wxMDIParentFrame))
|
||||||
|
#endif //wxUSE_MDI_ARCHITECTURE
|
||||||
|
|
||||||
if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
|
if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user