Bugfixes: checkboxes to radiobuttons (from J�rgen S) and remove a little

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

diff --git a/src/frontends/xforms/FormError.C b/src/frontends/xforms/FormError.C
index 2a73930985842d0cf4ecc22eef06ab9005f2d439..9c6cedd1895dd302d17cc4e62991f97c1aeabfc5 100644 (file)
--- a/src/frontends/xforms/FormError.C
+++ b/src/frontends/xforms/FormError.C
@@ -1,81 +1,48 @@
-// -*- C++ -*-
-/* This file is part of
+/*
+ * \file FormError.C
+ * This file is part of
  * ====================================================== 
  *
  *           LyX, The Document Processor
  *
- *           Copyright 2000 The LyX Team.
+ *           Copyright 2000-2001 The LyX Team.
  *
  * ======================================================
+ *
+ * \author Angus Leeming, a.leeming@.ac.uk
  */
 
-#include <config.h>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include "Dialogs.h"
+#include <config.h>
+
+#include "xformsBC.h"
+#include "ControlError.h"
 #include "FormError.h"
 #include "form_error.h"
-#include "insets/inseterror.h"
-
-static int minh, minw;
-
-FormError::FormError( LyXView * lv, Dialogs * d )
-       : FormBase( lv, d, _("LaTeX Error"), BUFFER_DEPENDENT, HIDE ),
-         dialog_(0), ih_(0), message_("")
-{
-       // let the dialog be shown
-       // This is a permanent connection so we won't bother
-       // storing a copy because we won't be disconnecting.
-       d->showError.connect(slot(this, &FormError::showInset));
-}
+#include "xforms_helpers.h" // formatted
 
+typedef FormCB<ControlError, FormDB<FD_form_error> > base_class;
 
-FormError::~FormError()
-{
-       delete dialog_;
-}
+FormError::FormError(ControlError & c)
+       : base_class(c, _("LaTeX Error"))
+{}
 
 
-FL_FORM * FormError::form() const
-{
-       if ( dialog_ ) return dialog_->form;
-       return 0;
-}
-
-
-void FormError::clearStore()
-{
-       ih_.disconnect();
-       message_.empty();
-}
-
-
-void FormError::showInset( InsetError * inset )
+void FormError::build()
 {
-       if ( dialogIsOpen || inset == 0 ) return;
-
-       ih_ = inset->hide.connect(slot(this, &FormError::hide));
+       dialog_.reset(build_error());
 
-       message_ = inset->getContents();
-       show();
+        // Manage the cancel/close button
+       bc().setCancel(dialog_->button_cancel);
 }
 
 
 void FormError::update()
 {
-       fl_set_form_minsize(form(), minw, minh);
-       fl_set_object_label(dialog_->message, message_.c_str());
-}
-
-
-void FormError::build()
-{
-       dialog_ = build_error();
-
-       // XFORMS bug workaround
-       // Define the min/max dimensions. Actually applied in update()
-       minw = form()->w; minh = form()->h;
+       string const txt = formatted(controller().params(),
+                                    dialog_->message->w - 10);
+       fl_set_object_label(dialog_->message, txt.c_str());
 }