Ensure there is valid context for DrawRectangle

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

diff --git a/src/xrc/xh_ribbon.cpp b/src/xrc/xh_ribbon.cpp
index 09b8df21b3f9f2470ca0517df8fbbeaa0ba6b008..0e86f2fed8d3fb7b3a314a3c01b30fd7429692e4 100644 (file)
--- a/src/xrc/xh_ribbon.cpp
+++ b/src/xrc/xh_ribbon.cpp
@@ -146,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");