enable Font cache only for MacOSX and inline width() for other platform.

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

diff --git a/src/frontends/Dialogs.C b/src/frontends/Dialogs.C
index 494f91fa6c7dbfc6186ca8832c2d76897c345063..6a228c99da866f99cf83e679ef3df13b62482cfd 100644 (file)
--- a/src/frontends/Dialogs.C
+++ b/src/frontends/Dialogs.C
@@ -14,13 +14,16 @@
 
 #include "Dialogs.h"
 
+#include "lyx_cb.h"
+
 #include "controllers/Dialog.h"
 
-#include <boost/signals/signal2.hpp>
+#include <boost/signal.hpp>
 #include <boost/bind.hpp>
 
 
 using std::string;
+using lyx::frontend::Dialog;
 
 
 // Note that static boost signals break some compilers, so this wrapper
@@ -43,31 +46,29 @@ private:
 };
 
 
-boost::signal0<void> & Dialogs::redrawGUI()
-{
-       static BugfixSignal<boost::signal0<void> > thesignal;
-       return thesignal();
-}
-
-
 namespace {
 
-BugfixSignal<boost::signal2<void, string const &, InsetBase*> > hideSignal;
+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);
 }
 
 
 Dialogs::Dialogs(LyXView & lyxview)
-       : 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));
 }
 
 
@@ -89,24 +90,32 @@ Dialog * Dialogs::find_or_build(string const & name)
 
 void Dialogs::show(string const & name, string const & data)
 {
-       Dialog * dialog = find_or_build(name);
-       if (!dialog)
+       if (in_show_) {
                return;
-
-       // FIXME! Should check that the dialog is NOT an inset dialog.
-       dialog->show(data);
+       }
+       in_show_ = true;
+       Dialog * dialog = find_or_build(name);
+       if (dialog) {
+               // FIXME! Should check that the dialog is NOT an inset dialog.
+               dialog->show(data);
+       }
+       in_show_ = false;
 }
 
 
 void Dialogs::show(string const & name, string const & data, InsetBase * inset)
 {
-       Dialog * dialog = find_or_build(name);
-       if (!dialog)
+       if (in_show_) {
                return;
-
-       // FIXME! Should check that the dialog IS an inset dialog.
-       dialog->show(data);
-       open_insets_[name] = inset;
+       }
+       in_show_ = true;
+       Dialog * dialog = find_or_build(name);
+       if (dialog) {
+               // FIXME! Should check that the dialog IS an inset dialog.
+               dialog->show(data);
+               open_insets_[name] = inset;
+       }
+       in_show_ = false;
 }
 
 
@@ -155,7 +164,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;
 }
 
 
@@ -222,3 +232,16 @@ void Dialogs::redraw() const
                it->second->redraw();
        }
 }
+
+
+void Dialogs::checkStatus()
+{
+       std::map<string, DialogPtr>::const_iterator it  = dialogs_.begin();
+       std::map<string, DialogPtr>::const_iterator end = dialogs_.end();
+
+       for(; it != end; ++it) {
+               Dialog * const dialog = it->second.get();
+               if (dialog->isVisible())
+                       dialog->checkStatus();
+       }
+}