Amend f441590c

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

diff --git a/src/frontends/qt4/GuiToc.cpp b/src/frontends/qt4/GuiToc.cpp
index e7840b102e9139df9961c2cc59abf09d8a22a817..7a64ba496909c65d5056eb3b8c708cb254b3062f 100644 (file)
--- a/src/frontends/qt4/GuiToc.cpp
+++ b/src/frontends/qt4/GuiToc.cpp
@@ -37,6 +37,7 @@ GuiToc::GuiToc(GuiView & parent, Qt::DockWidgetArea area, Qt::WindowFlags flags)
 {
        widget_ = new TocWidget(parent, this);
        setWidget(widget_);
+       setFocusProxy(widget_);
 }
 
 
@@ -65,18 +66,16 @@ void GuiToc::dispatchParams()
 }
 
 
-void GuiToc::enableView(bool enable)
+void GuiToc::enableView(bool /*enable*/)
 {
-       if (!enable)
-               // In the opposite case, updateView() will be called anyway.
-               widget_->updateView();
+       widget_->updateViewForce();
 }
 
 
 void GuiToc::closeEvent(QCloseEvent * /*event*/)
 {
        is_closing_ = true;
-       ((GuiView *)parent())->updateToolbars();
+       static_cast<GuiView *>(parent())->updateToolbars();
        is_closing_ = false;
 }
 
@@ -97,7 +96,7 @@ bool GuiToc::getStatus(Cursor & cur, FuncRequest const & cmd,
 Dialog * createGuiToc(GuiView & lv)
 {
        GuiToc * toc;
-#ifdef Q_WS_MACX
+#ifdef Q_OS_MAC
        // On Mac show at the right and floating
        toc = new GuiToc(lv, Qt::RightDockWidgetArea);
        toc->setFloating(true);