do not define boost::throw_exceptions if we are compiling with exceptions

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

diff --git a/src/frontends/Dialogs.C b/src/frontends/Dialogs.C
index 0c222c045e5f72aa8972d83a18a3c8efc9eaae6e..5ea2ef5ad3347dea7fa529b244aa8345e074ac29 100644 (file)
--- a/src/frontends/Dialogs.C
+++ b/src/frontends/Dialogs.C
@@ -65,10 +65,11 @@ void Dialogs::hide(string const & name, InsetBase* 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));
 }
 
 
@@ -90,24 +91,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;
 }
 
 
@@ -223,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();
+       }
+}