remove defaults stuff, let Qt handle no toolbar

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

diff --git a/src/frontends/xforms/FormMinipage.C b/src/frontends/xforms/FormMinipage.C
index eb37a93b8e894de957108e4544618bd48797b742..10d12e1204371b6b26b36ee7125240bdee029445 100644 (file)
--- a/src/frontends/xforms/FormMinipage.C
+++ b/src/frontends/xforms/FormMinipage.C
@@ -1,16 +1,15 @@
 /**
  * \file FormMinipage.C
- * Copyright 2000-2001 The LyX Team.
- * See the file COPYING.
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author Jürgen Vigna, jug@sad.it
+ * \author Jürgen Vigna
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "xformsBC.h"
 #include "ControlMinipage.h"
@@ -22,10 +21,10 @@
 #include "xforms_helpers.h"
 #include FORMS_H_LOCATION
 
-typedef FormCB<ControlMinipage, FormDB<FD_minipage> > base_class;
+typedef FormController<ControlMinipage, FormView<FD_minipage> > base_class;
 
-FormMinipage::FormMinipage(ControlMinipage & c, Dialogs & d)
-       : base_class(c, d, _("Minipage Options"))
+FormMinipage::FormMinipage(Dialog & parent)
+       : base_class(parent, _("Minipage Options"))
 {}
 
 
@@ -43,22 +42,22 @@ void FormMinipage::build()
        fl_addto_choice(dialog_->choice_width_units, subst(choice, "%", "%%").c_str());
 
        // Manage the ok, apply and cancel/close buttons
-       bc().setOK(dialog_->button_ok);
-       bc().setApply(dialog_->button_apply);
-       bc().setCancel(dialog_->button_close);
-       bc().setRestore(dialog_->button_restore);
-
-       bc().addReadOnly(dialog_->input_width);
-       bc().addReadOnly(dialog_->choice_width_units);
-       bc().addReadOnly(dialog_->radio_top);
-       bc().addReadOnly(dialog_->radio_middle);
-       bc().addReadOnly(dialog_->radio_bottom);
+       bcview().setOK(dialog_->button_ok);
+       bcview().setApply(dialog_->button_apply);
+       bcview().setCancel(dialog_->button_close);
+       bcview().setRestore(dialog_->button_restore);
+
+       bcview().addReadOnly(dialog_->input_width);
+       bcview().addReadOnly(dialog_->choice_width_units);
+       bcview().addReadOnly(dialog_->radio_top);
+       bcview().addReadOnly(dialog_->radio_middle);
+       bcview().addReadOnly(dialog_->radio_bottom);
 }
 
 
 void FormMinipage::apply()
 {
-       controller().params().pageWidth =
+       controller().params().width =
                LyXLength(getLengthFromWidgets(dialog_->input_width,
                                               dialog_->choice_width_units));
 
@@ -73,7 +72,7 @@ void FormMinipage::apply()
 
 void FormMinipage::update()
 {
-       LyXLength len(controller().params().pageWidth);
+       LyXLength len(controller().params().width);
        fl_set_input(dialog_->input_width, tostr(len.value()).c_str());
        fl_set_choice(dialog_->choice_width_units, len.unit() + 1);
 
@@ -106,7 +105,7 @@ ButtonPolicy::SMInput FormMinipage::input(FL_OBJECT * ob, long)
        // disallow senseless data
        // warnings if input is senseless
        if (ob == dialog_->input_width) {
-               string const input = getStringFromInput(dialog_->input_width);
+               string const input = getString(dialog_->input_width);
                bool const invalid = !isValidLength(input) && !isStrDbl(input);
                if (invalid) {
                        postWarning(_("Invalid Length!"));