Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable dropdown menu support in wxRibbonXmlHandler.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2012-10-24 18:33:57 +00:00
parent 9db1772739
commit 3142ae0727
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/xrc/xh_ribbon.cpp
View File

@@ -146,7 +146,12 @@ wxObject* wxRibbonXmlHandler::Handle_button()
if (GetBool(wxT("hybrid"))) if (GetBool(wxT("hybrid")))
kind = wxRIBBON_BUTTON_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 // check whether we have dropdown tag inside
wxMenu *menu = NULL; // menu for drop down items wxMenu *menu = NULL; // menu for drop down items
wxXmlNode * const nodeDropdown = GetParamNode("dropdown"); wxXmlNode * const nodeDropdown = GetParamNode("dropdown");