Rename .C => .cpp for files in src/frontends/controllers, step 1

[lyx.git] / src / frontends / Dialogs.C

diff --git a/src/frontends/Dialogs.C b/src/frontends/Dialogs.C
index 8eead27764696bfe76c260b824effd7fedcd809c..b02cf97f6f788102a42e4bce0ea9b6146ecc88c8 100644 (file)
--- a/src/frontends/Dialogs.C
+++ b/src/frontends/Dialogs.C
@@ -14,12 +14,17 @@
 
 #include "Dialogs.h"
 
+#include "lyx_cb.h"
+
 #include "controllers/Dialog.h"
 
 #include <boost/signal.hpp>
 #include <boost/bind.hpp>
 
 
+namespace lyx {
+
+
 using std::string;
 using lyx::frontend::Dialog;
 
@@ -44,13 +49,6 @@ private:
 };
 
 
-boost::signal<void()> & Dialogs::redrawGUI()
-{
-       static BugfixSignal<boost::signal<void()> > thesignal;
-       return thesignal();
-}
-
-
 namespace {
 
 BugfixSignal<boost::signal<void(string const &, InsetBase*)> > hideSignal;
@@ -60,7 +58,12 @@ BugfixSignal<boost::signal<void(string const &, InsetBase*)> > hideSignal;
 
 void Dialogs::hide(string const & name, InsetBase* inset)
 {
-       hideSignal()(name, inset);
+       // Don't send the signal if we are quitting, because on MSVC it is
+       // destructed before the cut stack in CutAndPaste.C, and this method
+       // is called from some inset destructor if the cut stack is not empty
+       // on exit.
+       if (!quitting)
+               hideSignal()(name, inset);
 }
 
 
@@ -68,7 +71,7 @@ Dialogs::Dialogs(LyXView & lyxview)
        : lyxview_(lyxview), in_show_(false)
 {
        // Connect signals
-       redrawGUI().connect(boost::bind(&Dialogs::redraw, this));
+       hideSignal().connect(boost::bind(&Dialogs::hideSlot, this, _1, _2));
 }
 
 
@@ -164,7 +167,8 @@ void Dialogs::disconnect(string const & name)
        if (!isValidName(name))
                return;
 
-       open_insets_[name] = 0;
+       if (open_insets_.find(name) != open_insets_.end())
+               open_insets_[name] = 0;
 }
 
 
@@ -211,7 +215,10 @@ void Dialogs::updateBufferDependent(bool switched) const
        for(; it != end; ++it) {
                Dialog * dialog =  it->second.get();
                if (switched && dialog->controller().isBufferDependent()) {
-                       dialog->hide();
+                       if (dialog->isVisible() && dialog->controller().initialiseParams(""))
+                               dialog->view().update();
+                       else
+                               dialog->hide();
                } else {
                        // A bit clunky, but the dialog will request
                        // that the kernel provides it with the necessary
@@ -244,3 +251,6 @@ void Dialogs::checkStatus()
                        dialog->checkStatus();
        }
 }
+
+
+} // namespace lyx