X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finseterror.C;h=cd4b51737c3d6bfcb4c3ceac13f4cad805d1849b;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=a3d2928b58e26789394b2c7ecc2aad4e700b60c3;hpb=c52895023e231587208b5c9257ae7825dc493ef0;p=lyx.git

diff --git a/src/insets/inseterror.C b/src/insets/inseterror.C
index a3d2928b58..cd4b51737c 100644
--- a/src/insets/inseterror.C
+++ b/src/insets/inseterror.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  * 	 
  *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -14,178 +14,85 @@
 #pragma implementation
 #endif
 
-#include "inseterror.h"
+#include "BufferView.h"
+#include "font.h"
+#include "lyxfont.h"
 #include "gettext.h"
-#include "lyx_gui_misc.h" // CancelCloseBoxCB
+#include "inseterror.h"
+#include "LyXView.h"
 #include "Painter.h"
+#include "frontends/Dialogs.h"
 
-/* Error, used for the LaTeX-Error Messages */
-
-InsetError::InsetError()
-{
-	form = 0;
-}
+using std::ostream;
 
+/* Error, used for the LaTeX-Error Messages */
 
-InsetError::InsetError(string const & str)
+InsetError::InsetError(string const & str, bool)
 	: contents(str)
-{
-	form = 0;
-}
-
-
-InsetError::~InsetError()
-{
-	if (form) {
-		fl_hide_form(form);
-		fl_free_form(form);
-		form = 0;
-	}
-}
+{}
 
 
-int InsetError::ascent(Painter &, LyXFont const & font) const
+int InsetError::ascent(BufferView *, LyXFont const & font) const
 {
 	LyXFont efont;
 	efont.setSize(font.size()).decSize();
-	return efont.maxAscent() + 1;
+	return lyxfont::maxAscent(efont) + 1;
 }
 
 
-int InsetError::descent(Painter &, LyXFont const & font) const
+int InsetError::descent(BufferView *, LyXFont const & font) const
 {
 	LyXFont efont;
 	efont.setSize(font.size()).decSize();
-	return efont.maxDescent() + 1;
+	return lyxfont::maxDescent(efont) + 1;
 }
 
 
-int InsetError::width(Painter &, LyXFont const & font) const
+int InsetError::width(BufferView *, LyXFont const & font) const
 {
 	LyXFont efont;
 	efont.setSize(font.size()).decSize();
-	return 6 + efont.textWidth(_("Error"), strlen(_("Error")));
+	return 6 + lyxfont::width(_("Error"), efont);
 }
 
 
-void InsetError::draw(Painter & pain, LyXFont const & font,
-		      int baseline, float & x) const
+void InsetError::draw(BufferView * bv, LyXFont const & font,
+		      int baseline, float & x, bool) const
 {
+	Painter & pain = bv->painter();
 	LyXFont efont;
 	efont.setSize(font.size()).decSize();
 	efont.setColor(LColor::error);
    
 	// Draw as "Error" in a framed box
 	x += 1;
-	pain.fillRectangle(int(x), baseline - ascent(pain, font) + 1,
-			  width(pain, font) - 2,
-			  ascent(pain, font) + descent(pain, font) - 2,
+	pain.fillRectangle(int(x), baseline - ascent(bv, font) + 1,
+			  width(bv, font) - 2,
+			  ascent(bv, font) + descent(bv, font) - 2,
 			   LColor::insetbg);
-	pain.rectangle(int(x), baseline - ascent(pain, font) + 1,
-		       width(pain, font) - 2,
-		       ascent(pain, font) + descent(pain, font) - 2,
+	pain.rectangle(int(x), baseline - ascent(bv, font) + 1,
+		       width(bv, font) - 2,
+		       ascent(bv, font) + descent(bv, font) - 2,
 		       LColor::error);
 	pain.text(int(x + 2), baseline, _("Error"), efont);
 
-	x +=  width(pain, font) - 1;
-}
-
-
-void InsetError::Write(ostream &) const
-{
-}
-
-
-void InsetError::Read(LyXLex &)
-{
-}
-
-
-int InsetError::Latex(ostream &, signed char /*fragile*/) const
-{
-	return 0;
-}
-
-
-int InsetError::Latex(string &, signed char /*fragile*/) const
-{
-	return 0;
-}
-
-
-int InsetError::Linuxdoc(string &) const
-{
-	return 0;
-}
-
-
-int InsetError::DocBook(string &) const
-{
-	return 0;
-}
-
-
-bool InsetError::AutoDelete() const
-{
-	return true;
-}
-
-
-unsigned char InsetError::Editable() const
-{
-	return 1;
-}
-
-
-void InsetError::CloseErrorCB(FL_OBJECT * ob, long)
-{
-	InsetError * inset = static_cast<InsetError*>(ob->u_vdata);
-	if (inset->form) {
-		fl_hide_form(inset->form);
-		fl_free_form(inset->form);
-		inset->form = 0;
-	}
+	x +=  width(bv, font) - 1;
 }
 
 
-// A C wrapper
-extern "C" void C_InsetError_CloseErrorCB(FL_OBJECT * ob, long data)
+string const InsetError::editMessage() const 
 {
-        InsetError::CloseErrorCB(ob , data);
+	return _("Opened error");
 }
 
 
-void InsetError::Edit(BufferView *, int, int)
+void InsetError::edit(BufferView * bv, int, int, unsigned int)
 {
-	static int ow = 400, oh = 240;
-
-	if (!form) {
-		FL_OBJECT * obj;
-		form = fl_bgn_form(FL_UP_BOX, ow, oh);
-		strobj = fl_add_box(FL_FRAME_BOX, 10, 10, 380, 180, "");
-		fl_set_object_color(strobj, FL_MCOL, FL_MCOL);
-		fl_set_object_gravity(strobj, FL_NorthWest, FL_SouthEast);
-		obj = fl_add_button(FL_RETURN_BUTTON, 140, 200, 120, 30,
-				    _("Close"));
-		fl_set_object_callback(obj, C_InsetError_CloseErrorCB, 0);
-		obj->u_vdata = this;
-		fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
-		fl_set_object_resize(obj, FL_RESIZE_NONE);
-		fl_end_form();
-		fl_set_form_atclose(form, CancelCloseBoxCB, 0);
-	}
-	fl_set_object_label(strobj, contents.c_str());
-	if (form->visible) {
-		fl_raise_form(form);
-	} else {
-		fl_show_form(form, FL_PLACE_MOUSE | FL_FREE_SIZE,
-			     FL_FULLBORDER, _("LaTeX Error"));
-		fl_set_form_minsize(form, ow, oh);
-	}
+	bv->owner()->getDialogs()->showError(this);
 }
 
 
-Inset * InsetError::Clone() const
+void InsetError::edit(BufferView * bv, bool)
 {
-	return new InsetError(contents);
+	edit(bv, 0, 0, 0);
 }