From 073e104114531fdfc3e1ea01d51b2c1048f78b74 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 9 Dec 2009 07:27:22 +0000 Subject: [PATCH] make sure it is compilable w/o menus (eg on iPhone) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/xrc/xh_toolb.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp index b88c400d3f..fc0c19c7b9 100644 --- a/src/xrc/xh_toolb.cpp +++ b/src/xrc/xh_toolb.cpp @@ -78,7 +78,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource() kind = wxITEM_CHECK; } - +#if wxUSE_MENUS // check whether we have dropdown tag inside wxMenu *menu = NULL; // menu for drop down items wxXmlNode * const nodeDropdown = GetParamNode("dropdown"); @@ -122,7 +122,7 @@ wxObject *wxToolBarXmlHandler::DoCreateResource() } } } - +#endif wxToolBarToolBase * const tool = m_toolbar->AddTool ( @@ -137,10 +137,11 @@ wxObject *wxToolBarXmlHandler::DoCreateResource() if ( GetBool(wxT("disabled")) ) m_toolbar->EnableTool(GetID(), false); - +#if wxUSE_MENUS if ( menu ) tool->SetDropdownMenu(menu); - +#endif + return m_toolbar; // must return non-NULL } -- 2.45.2