* activate the view from the constructor. This makes sure that the

[lyx.git] / src / frontends / qt4 / GuiView.cpp

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 89fa9618ca0d6caaefc2e36f480e23e93aabd7b6..ba6b33dd0c7f6c7893996710ecffbc9c1e77f21f 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -277,6 +277,11 @@ GuiView::GuiView(int id)
        // GuiToolbars *must* be initialised before the menu bar.
        d.toolbars_ = new GuiToolbars(*this);
 
+       // set ourself as the current view. This is needed for the menu bar
+       // filling, at least for the static special menu item on Mac. Otherwise
+       // they are greyed out.
+       theLyXFunc().setLyXView(this);
+       
        // Fill up the menu bar.
        guiApp->menus().fillMenuBar(menuBar(), this);
 
@@ -366,6 +371,10 @@ void GuiView::showEvent(QShowEvent * e)
 
 void GuiView::closeEvent(QCloseEvent * close_event)
 {
+       // it can happen that this event arrives without selecting the view,
+       // e.g. when clicking the close button on a background window.
+       theLyXFunc().setLyXView(this);
+
        while (Buffer * b = buffer()) {
                if (b->parent()) {
                        // This is a child document, just close the tab after saving
@@ -539,7 +548,7 @@ void GuiView::on_lastWorkAreaRemoved()
 #ifdef Q_WS_MAC
        // On Mac close the view if there is no Tab open anymore,
        // but only if no splitter is visible
-       if (d.splitter_->count() == 1) {
+       if (!lyxrc.open_buffers_in_tabs && d.splitter_->count() == 1) {
                TabWorkArea * twa = qobject_cast<TabWorkArea *>(d.splitter_->widget(0));
                if (twa && twa->count() == 0) {
                        // close the view, as no tab is open anymore