fix tooltips in toolbar

[lyx.git] / src / frontends / LyXView.C

diff --git a/src/frontends/LyXView.C b/src/frontends/LyXView.C
index e5be0f283340567610781dca89977498fe256c4e..65e42cf318fb466fda96476aeb5c722cfa543eb1 100644 (file)
--- a/src/frontends/LyXView.C
+++ b/src/frontends/LyXView.C
@@ -25,7 +25,6 @@
 #include "lyx_cb.h"
 #include "BufferView.h"
 #include "bufferview_funcs.h"
-#include "lyxtextclasslist.h"
 
 #include "Dialogs.h"
 #include "Toolbar.h"
@@ -72,6 +71,7 @@ void LyXView::init()
 
        // Start autosave timer
        if (lyxrc.autosave) {
+               autosave_timeout_->timeout.connect(boost::bind(&LyXView::autoSave, this));
                autosave_timeout_->setTimeout(lyxrc.autosave * 1000);
                autosave_timeout_->start();
        }
@@ -124,12 +124,6 @@ Menubar * LyXView::getMenubar() const
 
 void LyXView::updateMenubar()
 {
-       if (!view()->buffer() && menubackend.hasMenu("main_nobuffer")) {
-               menubar_->set("main_nobuffer");
-       } else {
-               menubar_->set("main");
-       }
-
        menubar_->update();
 }
 
@@ -167,7 +161,7 @@ void LyXView::updateLayoutChoice()
 
        // update the layout display
        if (toolbar_->updateLayoutList(buffer()->params.textclass)) {
-               current_layout = textclasslist[buffer()->params.textclass].defaultLayoutName();
+               current_layout = buffer()->params.getLyXTextClass().defaultLayoutName();
        }
 
        string const & layout =