X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74a59798c0eea14e9bb3e39f416d641adcccd7e0..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/xrc/xh_ribbon.cpp?ds=sidebyside

diff --git a/src/xrc/xh_ribbon.cpp b/src/xrc/xh_ribbon.cpp
index 8728033186..0e86f2fed8 100644
--- a/src/xrc/xh_ribbon.cpp
+++ b/src/xrc/xh_ribbon.cpp
@@ -25,6 +25,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 +146,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");