X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormError.C;h=0a6b5b2d1a583f3e926ddb05de99f861742dd32a;hb=9f29ab3aa5fb11baca9bc28dc3710076cb3a2645;hp=96c40cc2f25c64fbb3e86c61cf00c3453a92c808;hpb=7ec7c9da44662529e8a0ad4d60836df43a059ecd;p=lyx.git

diff --git a/src/frontends/xforms/FormError.C b/src/frontends/xforms/FormError.C
index 96c40cc2f2..0a6b5b2d1a 100644
--- a/src/frontends/xforms/FormError.C
+++ b/src/frontends/xforms/FormError.C
@@ -21,10 +21,11 @@
 #include "insets/inseterror.h"
 #include "support/LAssert.h"
 
+using SigC::slot;
 
 FormError::FormError(LyXView * lv, Dialogs * d)
 	: FormInset( lv, d, _("LaTeX Error")),
-	  dialog_(0), inset_(0)
+	  inset_(0)
 {
 	Assert(lv && d);
 	// let the dialog be shown
@@ -34,15 +35,9 @@ FormError::FormError(LyXView * lv, Dialogs * d)
 }
 
 
-FormError::~FormError()
-{
-	delete dialog_;
-}
-
-
 FL_FORM * FormError::form() const
 {
-	if (dialog_) return dialog_->form;
+	if (dialog_.get()) return dialog_->form;
 	return 0;
 }
 
@@ -65,7 +60,7 @@ void FormError::showInset(InsetError * inset)
 
 	inset_ = inset;
 	message_ = inset->getContents();
-	ih_ = inset->hide.connect(slot(this, &FormError::hide));
+	ih_ = inset->hideDialog.connect(slot(this, &FormError::hide));
 	show();
 }
 
@@ -78,9 +73,9 @@ void FormError::update()
 
 void FormError::build()
 {
-	dialog_ = build_error();
+	dialog_.reset(build_error());
 
-	// Workaround dumb xforms sizing bug
-	minw_ = form()->w;
-	minh_ = form()->h;
+        // Manage the cancel/close button
+	bc().setCancel(dialog_->button_cancel);
+	bc().refresh();
 }