From: André Pönitz Date: Wed, 21 Aug 2002 06:39:45 +0000 (+0000) Subject: fix the fix X-Git-Tag: 1.6.10~18513 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1ac835206a9fe2ea34804e59897fa14b0f6aaa91;p=features.git fix the fix git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5049 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/MenuBackend.C b/src/MenuBackend.C index faa09a8a52..53622920e7 100644 --- a/src/MenuBackend.C +++ b/src/MenuBackend.C @@ -82,7 +82,7 @@ MenuItem::MenuItem(Kind kind, string const & label, MenuItem::MenuItem(Kind kind, string const & label, int action, - bool optional = false); + bool optional = false) : kind_(kind), label_(label), action_(action), submenuname_(), optional_(optional) {} @@ -92,6 +92,12 @@ MenuItem::~MenuItem() {} +void MenuItem::submenu(Menu * menu) +{ + submenu_.reset(menu); +} + + string const MenuItem::label() const { return token(label_, '|', 0); @@ -111,12 +117,6 @@ Menu & Menu::add(MenuItem const & i) } -void Menu::submenu(Menu * menu) -{ - submenu_.reset(menu); -} - - Menu & Menu::read(LyXLex & lex) { enum Menutags {