anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-23 16:52:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix compile

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4891 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-08-07 15:18:22 +00:00
parent a04092ebdb
commit 509ed151ac
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,7 @@
2002-08-07 John Levon <levon@movementarian.org>
* Menubar_pimpl.C: fix compile for gcc 3.1
2002-08-06 John Levon <levon@movementarian.org> 2002-08-06 John Levon <levon@movementarian.org>
* ui/QSpellcheckerDialogBase.ui: * ui/QSpellcheckerDialogBase.ui:

6
src/frontends/qt2/Menubar_pimpl.C
View File

@ -75,7 +75,7 @@ Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mbe)
Menu tomenu; Menu tomenu;
Menu const frommenu = menubackend_.getMenu(m->submenuname()); Menu const frommenu = menubackend_.getMenu(m->submenuname());
menubackend_.expand(frommenu, tomenu, owner_->buffer()); menubackend_.expand(frommenu, tomenu, owner_->buffer());
fillMenu(createMenu(owner_->menuBar(), m), tomenu); fillMenu(createMenu(owner_->menuBar(), &(*m)), tomenu);
} }
} }
@ -100,10 +100,10 @@ void Menubar::Pimpl::fillMenu(QMenuData * qmenu, Menu const & menu)
if (m->kind() == MenuItem::Separator) { if (m->kind() == MenuItem::Separator) {
qmenu->insertSeparator(); qmenu->insertSeparator();
} else if (m->kind() == MenuItem::Submenu) { } else if (m->kind() == MenuItem::Submenu) {
fillMenu(createMenu(qmenu, m), *m->submenu()); fillMenu(createMenu(qmenu, &(*m)), *m->submenu());
} else { } else {
qmenu->insertItem(getLabel(*m).c_str(), m->action()); qmenu->insertItem(getLabel(*m).c_str(), m->action());
MenuItemInfo const info(qmenu, m->action(), m); MenuItemInfo const info(qmenu, m->action(), &(*m));
items_[m->label()] = info; items_[m->label()] = info;
updateItem(info); updateItem(info);
} }