The forms resize patch, and small updates

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

diff --git a/src/frontends/xforms/FormError.C b/src/frontends/xforms/FormError.C
index 9a88be148d6f17790829cfc53648f026b8ed6649..9bdf9dfb69b3977bcb717bf8831f433ebca3b912 100644 (file)
--- a/src/frontends/xforms/FormError.C
+++ b/src/frontends/xforms/FormError.C
@@ -20,11 +20,9 @@
 #include "form_error.h"
 #include "insets/inseterror.h"
 
-static int minh, minw;
-
 FormError::FormError( LyXView * lv, Dialogs * d )
-       : FormBase( lv, d, BUFFER_DEPENDENT, _("LaTeX Error") ),
-         dialog_(0), ih_(0), message_("")
+       : FormInset( lv, d, _("LaTeX Error") ),
+         dialog_(0), inset_(0), message_("")
 {
        // let the dialog be shown
        // This is a permanent connection so we won't bother
@@ -46,27 +44,35 @@ FL_FORM * FormError::form() const
 }
 
 
-void FormError::clearStore()
+void FormError::disconnect()
 {
-       ih_.disconnect();
+       inset_ = 0;
        message_.empty();
+       FormInset::disconnect();
 }
 
 
 void FormError::showInset( InsetError * inset )
 {
-       if ( dialogIsOpen || inset == 0 ) return;
+       if (inset == 0) return;
 
-       ih_ = inset->hide.connect(slot(this, &FormError::hide));
+       // If connected to another inset, disconnect from it.
+       if (inset_)
+               ih_.disconnect();
 
-       message_ = inset->getContents();
+       inset_    = inset;
+       message_  = inset->getContents();
        show();
 }
 
 
-void FormError::update()
+void FormError::update(bool switched)
 {
-       fl_set_form_minsize(form(), minw, minh);
+       if (switched) {
+               hide();
+               return;
+       }
+
        fl_set_object_label(dialog_->message, message_.c_str());
 }
 
@@ -75,7 +81,7 @@ 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;
 }