try this for distinguishing inner and outer tabs

[lyx.git] / src / frontends / xforms / FormError.C

diff --git a/src/frontends/xforms/FormError.C b/src/frontends/xforms/FormError.C
index 9033ff487386cfde0dfef9c3a28e280be7218695..46345e92f4bc674888bf3e6b237a709795361ae0 100644 (file)
--- 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 )
-       : FormInset( lv, d, _("LaTeX Error") ),
-         dialog_(0), inset_(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,7 +42,7 @@ FormError::~FormError()
 
 FL_FORM * FormError::form() const
 {
-       if ( dialog_ ) return dialog_->form;
+       if (dialog_) return dialog_->form;
        return 0;
 }
 
@@ -49,33 +50,28 @@ FL_FORM * FormError::form() const
 void FormError::disconnect()
 {
        inset_ = 0;
-       message_.empty();
+       message_.erase();
        FormInset::disconnect();
 }
 
 
-void FormError::showInset( InsetError * inset )
+void FormError::showInset(InsetError * inset)
 {
-       if (inset == 0) return;
+       if (inset == 0) return; // Is this _really_ allowed? (Lgb)
 
        // If connected to another inset, disconnect from it.
        if (inset_)
                ih_.disconnect();
 
-       inset_    = inset;
-       message_  = inset->getContents();
+       inset_ = inset;
+       message_ = inset->getContents();
+       ih_ = inset->hideDialog.connect(slot(this, &FormError::hide));
        show();
 }
 
 
-void FormError::update(bool switched)
+void FormError::update()
 {
-       if (switched) {
-               hide();
-               return;
-       }
-
-       fl_set_form_minsize(form(), minw, minh);
        fl_set_object_label(dialog_->message, message_.c_str());
 }
 
@@ -84,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();
 }