try this for distinguishing inner and outer tabs

[lyx.git] / src / MenuBackend.C

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 1196dbaf2c23aeb7fc1b906dc3136d837d93cffd..53cdc1200de8d420482f2a0f42ab057e77bc1795 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -52,7 +52,6 @@ MenuItem::MenuItem(Kind kind, string const & label,
        case Documents:
        case Lastfiles:
        case Toc:
-       case References:
        case ViewFormats:
        case UpdateFormats:
        case ExportFormats:
@@ -93,7 +92,6 @@ Menu & Menu::read(LyXLex & lex)
                md_importformats,
                md_lastfiles,
                md_optitem,
-               md_references,
                md_separator,
                md_submenu,
                md_toc,
@@ -110,7 +108,6 @@ Menu & Menu::read(LyXLex & lex)
                { "item", md_item },
                { "lastfiles", md_lastfiles },
                { "optitem", md_optitem }, 
-               { "references", md_references },
                { "separator", md_separator },
                { "submenu", md_submenu },
                { "toc", md_toc },
@@ -157,10 +154,6 @@ Menu & Menu::read(LyXLex & lex)
                        add(MenuItem(MenuItem::Toc));
                        break;
 
-               case md_references:
-                       add(MenuItem(MenuItem::References));
-                       break;
-
                case md_viewformats:
                        add(MenuItem(MenuItem::ViewFormats));
                        break;
@@ -226,6 +219,13 @@ void Menu::checkShortcuts() const
        }
 }
 
+class compare_format {
+public:
+       bool operator()(Format const * p1, Format const * p2) {
+               return *p1 < *p2;       
+       }
+};
+
 void Menu::expand(Menu & tomenu, Buffer * buf) const
 {
        for (const_iterator cit = begin();
@@ -292,7 +292,7 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const
                                formats = Exporter::GetExportableFormats(buf, false); 
                                action = LFUN_EXPORT;
                        }
-                       sort(formats.begin(), formats.end());
+                       sort(formats.begin(), formats.end(), compare_format());
 
                        for (vector<Format const *>::const_iterator fit = formats.begin();
                             fit != formats.end() ; ++fit) {