make menu warnings unconditional

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7337 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2003-07-22 09:15:55 +00:00
parent b249c0b0bb
commit c3e778fedb
2 changed files with 11 additions and 8 deletions

View File

@ -1,3 +1,7 @@
2003-07-21 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* MenuBackend.C (expand): check menu shortcuts unconditionally
2003-07-21 Angus Leeming <leeming@lyx.org> 2003-07-21 Angus Leeming <leeming@lyx.org>
* factory.C (createInset): pass a * factory.C (createInset): pass a
@ -159,7 +163,7 @@
* aspell.C: add missing namespace lyx::support * aspell.C: add missing namespace lyx::support
2003-07-07 Alfredo Brauntein <abraunst@libero.it> 2003-07-07 Alfredo Braunstein <abraunst@libero.it>
* BufferView.[Ch] (newFile): Add * BufferView.[Ch] (newFile): Add
* BufferView_pimpl.[Ch] (newFile, connectBuffer, disconnectBuffer): Add * BufferView_pimpl.[Ch] (newFile, connectBuffer, disconnectBuffer): Add
@ -249,7 +253,7 @@
* textcursor.h: new struct for cursor-related data * textcursor.h: new struct for cursor-related data
2003-06-26 Alfredo Brauntein <abraunst@lyx.org> 2003-06-26 Alfredo Braunstein <abraunst@lyx.org>
* lyx_main.C (LyX): get full path of document loaded on the * lyx_main.C (LyX): get full path of document loaded on the
command line command line
@ -261,12 +265,12 @@
* text.C: remove only use of broken operator<= in an Assert(). * text.C: remove only use of broken operator<= in an Assert().
2003-06-24 Alfredo Brauntein <abraunst@lyx.org> 2003-06-24 Alfredo Braunstein <abraunst@lyx.org>
* BufferView.[Ch] (getErrorList): removed unneeded forward declare, * BufferView.[Ch] (getErrorList): removed unneeded forward declare,
moved errorlist_.clear to showErrorList moved errorlist_.clear to showErrorList
2003-06-24 Alfredo Brauntein <abraunst@lyx.org> 2003-06-24 Alfredo Braunstein <abraunst@lyx.org>
* converter.C (scanLog, runLaTeX): * converter.C (scanLog, runLaTeX):
* buffer.C (makeLinuxDocFile, makeDocBookFile, runChkTeX): * buffer.C (makeLinuxDocFile, makeDocBookFile, runChkTeX):

View File

@ -325,7 +325,7 @@ Menu & Menu::read(LyXLex & lex)
void Menu::checkShortcuts() const void Menu::checkShortcuts() const
{ {
// This is a quadratic algorithm, but we do not care because // This is a quadratic algorithm, but we do not care because
// it is used for debugging only. // menus are short enough
for (const_iterator it1 = begin(); it1 != end(); ++it1) { for (const_iterator it1 = begin(); it1 != end(); ++it1) {
string shortcut = it1->shortcut(); string shortcut = it1->shortcut();
if (shortcut.empty()) if (shortcut.empty())
@ -334,7 +334,7 @@ void Menu::checkShortcuts() const
lyxerr << "Menu warning: menu entry \"" lyxerr << "Menu warning: menu entry \""
<< it1->label() << it1->label()
<< "\" does not contain shortcut `" << "\" does not contain shortcut `"
<< shortcut << '\'' << endl; << shortcut << "'." << endl;
for (const_iterator it2 = begin(); it2 != it1 ; ++it2) { for (const_iterator it2 = begin(); it2 != it1 ; ++it2) {
if (!compare_ascii_no_case(it2->shortcut(), shortcut)) { if (!compare_ascii_no_case(it2->shortcut(), shortcut)) {
lyxerr << "Menu warning: menu entries " lyxerr << "Menu warning: menu entries "
@ -693,8 +693,7 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
tomenu.items_.pop_back(); tomenu.items_.pop_back();
// Check whether the shortcuts are unique // Check whether the shortcuts are unique
if (lyxerr.debugging(Debug::GUI)) tomenu.checkShortcuts();
tomenu.checkShortcuts();
} }