X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74a59798c0eea14e9bb3e39f416d641adcccd7e0..4b263e5ef358411a345dee9ffef3ba69c19be40e:/src/xrc/xh_ribbon.cpp

diff --git a/src/xrc/xh_ribbon.cpp b/src/xrc/xh_ribbon.cpp
index 8728033186..cc352103f6 100644
--- a/src/xrc/xh_ribbon.cpp
+++ b/src/xrc/xh_ribbon.cpp
@@ -3,7 +3,6 @@
 // Purpose:     XML resource handler for wxRibbon related classes
 // Author:      Armel Asselin
 // Created:     2010-04-23
-// RCS-ID:      $Id$
 // Copyright:   (c) 2010 Armel Asselin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,6 +24,10 @@
 
 #include "wx/scopeguard.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/menu.h"
+#endif
+
 // Ribbon bars can contain only pages which are usually panels but may contain
 // any wxWindow.
 //
@@ -142,7 +145,12 @@ wxObject* wxRibbonXmlHandler::Handle_button()
     if (GetBool(wxT("hybrid")))
         kind = wxRIBBON_BUTTON_HYBRID;
 
-#if wxUSE_MENUS
+    // FIXME: The code below uses wxXmlNode directly but this can't be done
+    //        in the ribbon library code as it would force it to always link
+    //        with the xml library. Disable it for now but the real solution
+    //        would be to virtualize GetChildren() and GetNext() methods via
+    //        wxXmlResourceHandler, just as we already do for many others.
+#if 0 // wxUSE_MENUS
     // check whether we have dropdown tag inside
     wxMenu *menu = NULL; // menu for drop down items
     wxXmlNode * const nodeDropdown = GetParamNode("dropdown");