John's Layout Tabular UI improvements and Martins fixes to clearing the

[lyx.git] / src / MenuBackend.C

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 4f44e3fa60379ddf7c9fe124c45aeeebef122161..de6b67c0a181569acd798a36a52a345f21266430 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -22,6 +22,7 @@
 #include "debug.h"
 #include "gettext.h"
 #include "lastfiles.h"
+#include "lyx_main.h" // for lastfiles
 #include "bufferlist.h"
 #include "converter.h"
 #include "exporter.h"
@@ -33,7 +34,6 @@
 #include "support/lstrings.h"
 
 extern LyXAction lyxaction;
-extern LastFiles * lastfiles; 
 extern BufferList bufferlist;
 
 using std::endl;
@@ -79,11 +79,13 @@ MenuItem::MenuItem(Kind kind, string const & label,
        }
 }
 
+
 string const MenuItem::label() const 
 { 
        return token(label_, '|', 0); 
 }
 
+
 string const MenuItem::shortcut() const
 { 
        return token(label_, '|', 1); 
@@ -246,6 +248,7 @@ void Menu::checkShortcuts() const
        }
 }
 
+
 namespace {
 
 class compare_format {
@@ -366,8 +369,7 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const
                                int const action =  lyxaction
                                        .getPseudoAction(LFUN_FLOAT_LIST,
                                                         cit->second.type());
-                               string label = _("List of ");
-                               label += cit->second.name();
+                               string const label = cit->second.name() + _(" List");
                                tomenu.add(MenuItem(MenuItem::Command,
                                                    label, action));
                        }