use wxChar correctly in wxString docs; mark wx1 compatibility functions

[wxWidgets.git] / src / xrc / xh_menu.cpp

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index 12d8b4a3211921d26aafe53d9c2d658b86925547..217b155c024c82097429ab871de3c5c17d1f0614 100644 (file)
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -15,16 +15,15 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_MENUS
 
 #include "wx/xrc/xh_menu.h"
 
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
+    #include "wx/menu.h"
 #endif
 
-#include "wx/menu.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxMenuXmlHandler, wxXmlResourceHandler)
 
 wxMenuXmlHandler::wxMenuXmlHandler() :
@@ -150,4 +149,4 @@ bool wxMenuBarXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxMenuBar"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_MENUS