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

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 5ee13bedb311976cdf8b48b0238c4d0341c0b9b3..38a7dfadd9a7218b9ade0c938bc70af34461c06b 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -36,6 +36,7 @@
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/mdi.h"

 #endif
 
 #if wxUSE_OWNER_DRAWN
 #endif
 
 #if wxUSE_OWNER_DRAWN


@@ -1059,6 +1060,7 @@ wxMenu *wxMenuBar::Remove(size_t pos)
             }
         }
 #else
             }
         }
 #else

+#if wxUSE_MDI_ARCHITECTURE

         //MDI - window menu stuff
         if (GetFrame() && GetFrame()->IsKindOf(CLASSINFO(wxMDIParentFrame)))
         {
         //MDI - window menu stuff
         if (GetFrame() && GetFrame()->IsKindOf(CLASSINFO(wxMDIParentFrame)))
         {


@@ -1130,6 +1132,7 @@ wxMenu *wxMenuBar::Remove(size_t pos)
                 }//end if child == wxMDIChildFrame
             }//end children iteration loop
         }//end if GetFrame()->IsKindOf(CLASSINFO(wxMDIParentFrame))
                 }//end if child == wxMDIChildFrame
             }//end children iteration loop
         }//end if GetFrame()->IsKindOf(CLASSINFO(wxMDIParentFrame))

+#endif //wxUSE_MDI_ARCHITECTURE

 
         if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
         {
 
         if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
         {