From: Stefan Schimanski <sts@lyx.org>
Date: Fri, 14 Mar 2008 23:29:11 +0000 (+0000)
Subject: * activate the view from the constructor. This makes sure that the
X-Git-Tag: 1.6.10~5633
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4e223167ff2872ee123c8354d486352c8a368102;hp=25e0113c9c4d7df72f7033f984e444605324cab5;p=lyx.git

* activate the view from the constructor. This makes sure that the
  special menu item for Mac see the "right" status of the LFUNs.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23738 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 69b3f48522..69e5f09a28 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -393,8 +393,7 @@ void GuiApplication::createView(QString const & geometry_arg)
 	// register view
 	views_[id] = view;
 	updateIds(views_, view_ids_);
-	
-	theLyXFunc().setLyXView(view);
+
 	view->show();
 	if (!geometry_arg.isEmpty()) {
 #ifdef Q_WS_WIN
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 132ef9392c..ba6b33dd0c 100644
--- 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);