fix the more... problem

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5445 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 71cb119419e57a7a9962d37872ea67f074087401..758527a623907ceff442acd543b8d0f70abf5aa8 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-16  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * Menubar_pimpl.C (create_submenu): do not create a "More..."
+       submenu just for one entry
+
 2002-10-15  Angus Leeming  <leeming@lyx.org>
 
        * XWorkArea.C (work_area_handler): Pass the mouse button correctly to

diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C
index 0cd25b3aec0ceafece31d6cf20d8bad4aecb2028..042ba49280c332033240ca881afe274ea9b772a6 100644 (file)
--- a/src/frontends/xforms/Menubar_pimpl.C
+++ b/src/frontends/xforms/Menubar_pimpl.C
@@ -250,7 +250,9 @@ int Menubar::Pimpl::create_submenu(Window win, XFormsView * view,
                string & extra_label = *it;
 
                ++count;
-               if (count > max_number_of_items) {
+               // add a More... submenu if the menu is too long (but
+               // not just for one extra entry!)
+               if (count > max_number_of_items && (i+1) != end) {
                        int tmpmenuid = get_new_submenu(smn, win);
                        lyxerr[Debug::GUI] << "Too many items, creating "
                                           << "new menu " << tmpmenuid << endl;