add more wxUSE_MENUS guards

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index 5115b619dd5703ca4e7217115173ba2ec10ffd7c..9c2389e9a6f482ffc59871f79a414fdeb6fce540 100644 (file)
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -74,11 +74,13 @@ public:
     // MDI helpers
     // -----------
 
     // MDI helpers
     // -----------
 

+#if wxUSE_MENUS

     // called by wxMDIChildFrame after it was successfully created
     virtual void AddMDIChild(wxMDIChildFrame *child);
 
     // called by wxMDIChildFrame just before it is destroyed
     virtual void RemoveMDIChild(wxMDIChildFrame *child);
     // called by wxMDIChildFrame after it was successfully created
     virtual void AddMDIChild(wxMDIChildFrame *child);
 
     // called by wxMDIChildFrame just before it is destroyed
     virtual void RemoveMDIChild(wxMDIChildFrame *child);

+#endif // wxUSE_MENUS

 
     // handlers
     // --------
 
     // handlers
     // --------

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 36f0a451ba11b475936ff8deb972aeb4dbf7facb..6f579ee9a75c0fdd3547e58dbbe31c87df076dcd 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -258,6 +258,8 @@ int wxMDIParentFrame::GetChildFramesCount() const
     return count;
 }
 
     return count;
 }
 

+#if wxUSE_MENUS
+

 void wxMDIParentFrame::AddMDIChild(wxMDIChildFrame * WXUNUSED(child))
 {
     switch ( GetChildFramesCount() )
 void wxMDIParentFrame::AddMDIChild(wxMDIChildFrame * WXUNUSED(child))
 {
     switch ( GetChildFramesCount() )


@@ -301,8 +303,6 @@ void wxMDIParentFrame::RemoveMDIChild(wxMDIChildFrame * WXUNUSED(child))
     }
 }
 
     }
 }
 

-#if wxUSE_MENUS
-

 // ----------------------------------------------------------------------------
 // wxMDIParentFrame window menu handling
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMDIParentFrame window menu handling
 // ----------------------------------------------------------------------------