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 04d404fe44d1bd42dca6c00f73c750c0e252bba4..5ea2ef5ad3347dea7fa529b244aa8345e074ac29 100644 (file)
--- a/src/frontends/Dialogs.C
+++ b/src/frontends/Dialogs.C
@@ -16,10 +16,14 @@
 
 #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
 // initialises the signal dynamically when it is first invoked.
 template<typename Signal>
@@ -40,16 +44,16 @@ private:
 };
 
 
-boost::signal0<void> & Dialogs::redrawGUI()
+boost::signal<void()> & Dialogs::redrawGUI()
 {
-       static BugfixSignal<boost::signal0<void> > thesignal;
+       static BugfixSignal<boost::signal<void()> > thesignal;
        return thesignal();
 }
 
 
 namespace {
 
-BugfixSignal<boost::signal2<void, string const &, InsetBase*> > hideSignal;
+BugfixSignal<boost::signal<void(string const &, InsetBase*)> > hideSignal;
 
 }
 
@@ -61,17 +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));
-
-       // All this is slated to go
-       init_pimpl();
-       // reduce the number of connections needed in
-       // dialogs by a simple connection here.
-       hideAllSignal.connect(hideBufferDependentSignal);
 }
 
 
@@ -86,31 +84,39 @@ Dialog * Dialogs::find_or_build(string const & name)
        if (it != dialogs_.end())
                return it->second.get();
 
-       dialogs_[name] = DialogPtr(build(name));
+       dialogs_[name] = build(name);
        return dialogs_[name].get();
 }
 
 
 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;
 }
 
 
@@ -182,7 +188,6 @@ void Dialogs::hideAll() const
        for(; it != end; ++it) {
                it->second->hide();
        }
-       hideAllSignal();
 }
 
 
@@ -196,7 +201,6 @@ void Dialogs::hideBufferDependent() const
                if (dialog->controller().isBufferDependent())
                        dialog->hide();
        }
-       hideBufferDependentSignal();
 }
 
 
@@ -216,7 +220,6 @@ void Dialogs::updateBufferDependent(bool switched) const
                        dialog->RestoreButton();
                }
        }
-       updateBufferDependentSignal(switched);
 }
 
 
@@ -229,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();
+       }
+}