Improve wording (#10670)

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

diff --git a/src/frontends/qt4/GuiToc.cpp b/src/frontends/qt4/GuiToc.cpp
index 9a22e81df721fe1841a43248129745ba0e6075c5..e124a468b428c48cf161d2341fa84c5633d973f2 100644 (file)
--- a/src/frontends/qt4/GuiToc.cpp
+++ b/src/frontends/qt4/GuiToc.cpp
@@ -33,42 +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_);
-}
-
-
-GuiToc::~GuiToc()
-{
-       delete widget_;
+       setFocusProxy(widget_);
 }
 
 
 void GuiToc::updateView()
 {
-#ifndef Q_WS_MACX
        widget_->updateView();
-       return;
-#endif
-
-       widget_->updateView();
-
-       // For Mac: switch to a docked TOC in fullscreen mode.
-       // We use the features() here instead of WindowFlags because
-       // the latter are not reliable (always returns Qt::Drawer).
-       if (!(features() & DockWidgetClosable) && lyxview().isFullScreen()) {
-               setWindowFlags(Qt::Widget);
-               setFeatures(DockWidgetClosable);
-               // Setting features hides the dialog, see Qt's doc.
-               show();
-       } else if ((features() & DockWidgetClosable) && !lyxview().isFullScreen()) {
-               setWindowFlags(Qt::Drawer);
-               setFeatures(NoDockWidgetFeatures);
-               // Setting features hides the dialog, see Qt's doc.
-               show();
-       }
 }
 
 
@@ -88,14 +64,14 @@ void GuiToc::enableView(bool enable)
 {
        if (!enable)
                // In the opposite case, updateView() will be called anyway.
-               widget_->updateView();
+               widget_->updateViewNow();
 }
 
 
-void GuiToc::closeEvent(QCloseEvent * event)
+void GuiToc::closeEvent(QCloseEvent * /*event*/)
 {
        is_closing_ = true;
-       ((GuiView *)parent())->updateToolbars();
+       static_cast<GuiView *>(parent())->updateToolbars();
        is_closing_ = false;
 }
 
@@ -115,13 +91,7 @@ bool GuiToc::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 Dialog * createGuiToc(GuiView & lv)
 {
-       GuiView & guiview = static_cast<GuiView &>(lv);
-#ifdef Q_WS_MACX
-       // On Mac show as a drawer at the right
-       return new GuiToc(guiview, Qt::RightDockWidgetArea, Qt::Drawer);
-#else
-       return new GuiToc(guiview);
-#endif
+       return new GuiToc(lv);
 }