fix starting up which binary is really a symlink; make sure insetinclude file browser...

[lyx.git] / src / LyXView.C

diff --git a/src/LyXView.C b/src/LyXView.C
index 97ab981e68bd215e78dda7eddb8353f351587a80..5b913c99ac8d2df2e997aff4c4494810fbc65b19 100644 (file)
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -111,7 +111,6 @@ void LyXView::setLayout(layout_type layout)
 void LyXView::updateToolbar()
 {
        toolbar->update();
-       menubar->update();
 }
 
 
@@ -158,6 +157,7 @@ void LyXView::updateMenubar()
                menubar->set("main_nobuffer");
        else
                menubar->set("main");
+       menubar->update();
 }
 
 
@@ -222,6 +222,7 @@ void LyXView::updateWindowTitle()
 {
        static string last_title = "LyX";
        string title = "LyX";
+       string icon_title = "LyX";
 
        if (view()->available()) {
                string const cur_title = buffer()->fileName();
@@ -231,19 +232,18 @@ void LyXView::updateWindowTitle()
                                title += _(" (Changed)");
                        if (buffer()->isReadonly())
                                title += _(" (read only)");
+                       /* Show only the filename if it's available. */
+                       icon_title = OnlyFilename(cur_title);
                }
        }
        if (title != last_title) {
-               setWindowTitle(title);
+               setWindowTitle(title, icon_title);
                last_title = title;
        }
-       last_title = title;
 }
 
 
 void LyXView::showState()
 {
        message(currentState(view()));
-       getToolbar()->update();
-       menubar->update();
 }