fix #832

[lyx.git] / src / insets / inseterror.C

diff --git a/src/insets/inseterror.C b/src/insets/inseterror.C
index da5bed5e9265c8a1fb36f9cea27377cb4e3032d7..1470506170a0bccc5086c5d3880bcd49fc0c1ef5 100644 (file)
--- a/src/insets/inseterror.C
+++ b/src/insets/inseterror.C
@@ -10,28 +10,50 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include "inseterror.h"
 
 #include "BufferView.h"
-#include "frontends/font_metrics.h"
-#include "lyxfont.h"
+#include "funcrequest.h"
 #include "gettext.h"
-#include "inseterror.h"
+#include "lyxfont.h"
+
+#include "frontends/Dialogs.h"
+#include "frontends/font_metrics.h"
 #include "frontends/LyXView.h"
 #include "frontends/Painter.h"
-#include "frontends/Dialogs.h"
+
+#include "support/LAssert.h"
 
 using std::ostream;
 
-/* Error, used for the LaTeX-Error Messages */
 
 InsetError::InsetError(string const & str, bool)
        : contents(str)
 {}
 
 
+InsetError::~InsetError()
+{
+       Dialogs::hide("error", this);
+}
+
+
+dispatch_result InsetError::localDispatch(FuncRequest const & cmd)
+{
+       dispatch_result result = UNDISPATCHED;
+
+       switch (cmd.action) {
+       case LFUN_MOUSE_RELEASE: 
+       case LFUN_INSET_EDIT: 
+               cmd.view()->owner()->getDialogs().show("error", getContents(), this);
+               return DISPATCHED;
+
+       default:
+               return Inset::localDispatch(cmd);
+       }
+}
+
+
 int InsetError::ascent(BufferView *, LyXFont const & font) const
 {
        LyXFont efont;
@@ -57,8 +79,11 @@ int InsetError::width(BufferView *, LyXFont const & font) const
 
 
 void InsetError::draw(BufferView * bv, LyXFont const & font,
-                     int baseline, float & x, bool) const
+                     int baseline, float & x) const
 {
+       lyx::Assert(bv);
+       cache(bv);
+
        Painter & pain = bv->painter();
        LyXFont efont;
        efont.setSize(font.size()).decSize();
@@ -84,15 +109,3 @@ string const InsetError::editMessage() const
 {
        return _("Opened error");
 }
-
-
-void InsetError::edit(BufferView * bv, int, int, mouse_button::state)
-{
-       bv->owner()->getDialogs().showError(this);
-}
-
-
-void InsetError::edit(BufferView * bv, bool)
-{
-       edit(bv, 0, 0, mouse_button::none);
-}