From 3142ae0727f3a11b878a70a71f60d4bd63e1e767 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 24 Oct 2012 18:33:57 +0000 Subject: [PATCH] Disable dropdown menu support in wxRibbonXmlHandler. The code handling it uses wxXmlNode directly as it's written now which isn't allowed as it introduces a dependency of ribbon library on the xml one and so currently breaks linking of the ribbon DLL under MSW. See #12058. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/xrc/xh_ribbon.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/xrc/xh_ribbon.cpp b/src/xrc/xh_ribbon.cpp index 09b8df21b3..0e86f2fed8 100644 --- 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"); -- 2.45.2