X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormError.C;h=a5a9fe7f2e29c4718d311abc394716416601920c;hb=eba67bc3120dc301bf193c3f3b570f51f00a4654;hp=9a88be148d6f17790829cfc53648f026b8ed6649;hpb=ebfcf1c0e72288b7131607af0330500c8739cead;p=lyx.git

diff --git a/src/frontends/xforms/FormError.C b/src/frontends/xforms/FormError.C
index 9a88be148d..a5a9fe7f2e 100644
--- a/src/frontends/xforms/FormError.C
+++ b/src/frontends/xforms/FormError.C
@@ -19,13 +19,14 @@
 #include "FormError.h"
 #include "form_error.h"
 #include "insets/inseterror.h"
+#include "support/LAssert.h"
 
-static int minh, minw;
 
-FormError::FormError( LyXView * lv, Dialogs * d )
-	: FormBase( lv, d, BUFFER_DEPENDENT, _("LaTeX Error") ),
-	  dialog_(0), ih_(0), message_("")
+FormError::FormError(LyXView * lv, Dialogs * d)
+	: FormInset( lv, d, _("LaTeX Error"), new OkCancelPolicy),
+	  dialog_(0), inset_(0)
 {
+	Assert(lv && d);
 	// let the dialog be shown
 	// This is a permanent connection so we won't bother
 	// storing a copy because we won't be disconnecting.
@@ -41,32 +42,36 @@ FormError::~FormError()
 
 FL_FORM * FormError::form() const
 {
-	if ( dialog_ ) return dialog_->form;
+	if (dialog_) return dialog_->form;
 	return 0;
 }
 
 
-void FormError::clearStore()
+void FormError::disconnect()
 {
-	ih_.disconnect();
-	message_.empty();
+	inset_ = 0;
+	message_.erase();
+	FormInset::disconnect();
 }
 
 
-void FormError::showInset( InsetError * inset )
+void FormError::showInset(InsetError * inset)
 {
-	if ( dialogIsOpen || inset == 0 ) return;
+	if (inset == 0) return; // Is this _really_ allowed? (Lgb)
 
-	ih_ = inset->hide.connect(slot(this, &FormError::hide));
+	// If connected to another inset, disconnect from it.
+	if (inset_)
+		ih_.disconnect();
 
+	inset_ = inset;
 	message_ = inset->getContents();
+	ih_ = inset->hide.connect(slot(this, &FormError::hide));
 	show();
 }
 
 
 void FormError::update()
 {
-	fl_set_form_minsize(form(), minw, minh);
 	fl_set_object_label(dialog_->message, message_.c_str());
 }
 
@@ -75,7 +80,11 @@ void FormError::build()
 {
 	dialog_ = build_error();
 
-	// XFORMS bug workaround
-	// Define the min/max dimensions. Actually applied in update()
-	minw = form()->w; minh = form()->h;
+	// Workaround dumb xforms sizing bug
+	minw_ = form()->w;
+	minh_ = form()->h;
+	
+        // Manage the cancel/close button
+	bc_.setCancel(dialog_->button_cancel);
+	bc_.refresh();
 }