X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiToc.cpp;h=e124a468b428c48cf161d2341fa84c5633d973f2;hb=1f10969bb5c5f36017bf5ba8671381b09945cf57;hp=7a64ba496909c65d5056eb3b8c708cb254b3062f;hpb=34bfad7f644e0c246caed6a30fa306143e365701;p=lyx.git

diff --git a/src/frontends/qt4/GuiToc.cpp b/src/frontends/qt4/GuiToc.cpp
index 7a64ba4969..e124a468b4 100644
--- a/src/frontends/qt4/GuiToc.cpp
+++ b/src/frontends/qt4/GuiToc.cpp
@@ -33,24 +33,18 @@ namespace lyx {
 namespace frontend {
 
 GuiToc::GuiToc(GuiView & parent, Qt::DockWidgetArea area, Qt::WindowFlags flags)
-	: DockView(parent, "toc", qt_("Outline"), area, flags), is_closing_(false)
+	: DockView(parent, "toc", qt_("Outline"), area, flags),
+	  widget_(new TocWidget(parent, this)),
+	  is_closing_(false)
 {
-	widget_ = new TocWidget(parent, this);
 	setWidget(widget_);
 	setFocusProxy(widget_);
 }
 
 
-GuiToc::~GuiToc()
-{
-	delete widget_;
-}
-
-
 void GuiToc::updateView()
 {
 	widget_->updateView();
-	return;
 }
 
 
@@ -66,9 +60,11 @@ void GuiToc::dispatchParams()
 }
 
 
-void GuiToc::enableView(bool /*enable*/)
+void GuiToc::enableView(bool enable)
 {
-	widget_->updateViewForce();
+	if (!enable)
+		// In the opposite case, updateView() will be called anyway.
+		widget_->updateViewNow();
 }
 
 
@@ -95,15 +91,7 @@ bool GuiToc::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 Dialog * createGuiToc(GuiView & lv)
 {
-	GuiToc * toc;
-#ifdef Q_OS_MAC
-	// On Mac show at the right and floating
-	toc = new GuiToc(lv, Qt::RightDockWidgetArea);
-	toc->setFloating(true);
-#else
-	toc = new GuiToc(lv);
-#endif
-	return toc;
+	return new GuiToc(lv);
 }