get rid of broken_header.h and some unneeded tests

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

diff --git a/src/frontends/xforms/FormWrap.C b/src/frontends/xforms/FormWrap.C
index 3a2c7892238f495e96403cf289a683df53442248..37788f02026d9c819649869f947be8d485c44de9 100644 (file)
--- a/src/frontends/xforms/FormWrap.C
+++ b/src/frontends/xforms/FormWrap.C
@@ -5,29 +5,39 @@
  *
  * \author Dekel Tsur
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-
 #include "xformsBC.h"
 #include "ControlWrap.h"
 #include "FormWrap.h"
 #include "forms/form_wrap.h"
 #include "Tooltips.h"
 
-#include "support/lstrings.h"
 #include "helper_funcs.h"
 #include "xforms_helpers.h"
 #include "checkedwidgets.h"
 
-#include FORMS_H_LOCATION
+#include "insets/insetwrap.h"
+#include "support/lstrings.h"
+#include "lyx_forms.h"
+#include "support/tostr.h"
+
+using std::string;
+
+namespace lyx {
 
-typedef FormCB<ControlWrap, FormDB<FD_wrap> > base_class;
+using support::getStringFromVector;
+using support::subst;
 
-FormWrap::FormWrap()
-       : base_class(_("Wrap Options"))
+namespace frontend {
+
+typedef FormController<ControlWrap, FormView<FD_wrap> > base_class;
+
+FormWrap::FormWrap(Dialog & parent)
+       : base_class(parent, _("Text Wrap Settings"))
 {}
 
 
@@ -36,17 +46,17 @@ void FormWrap::build()
        dialog_.reset(build_wrap(this));
 
        // 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);
+       bcview().setOK(dialog_->button_ok);
+       bcview().setApply(dialog_->button_apply);
+       bcview().setCancel(dialog_->button_close);
+       bcview().setRestore(dialog_->button_restore);
 
        // disable for read-only documents
-       bc().addReadOnly(dialog_->input_width);
-       bc().addReadOnly(dialog_->choice_width_units);
+       bcview().addReadOnly(dialog_->input_width);
+       bcview().addReadOnly(dialog_->choice_width_units);
 
        // check validity of "length + unit" input
-       addCheckedGlueLength(bc(), dialog_->input_width);
+       addCheckedGlueLength(bcview(), dialog_->input_width);
 
        // trigger an input event for cut&paste with middle mouse button.
        setPrehandler(dialog_->input_width);
@@ -80,26 +90,32 @@ void FormWrap::build()
 
 void FormWrap::apply()
 {
-       controller().params().pageWidth =
+       InsetWrapParams & params = controller().params();
+
+       params.width =
                LyXLength(getLengthFromWidgets(dialog_->input_width,
                                               dialog_->choice_width_units));
 
        char const c = static_cast<char>(placement_.get());
        if (c)
-               controller().params().placement = c;
+               params.placement = c;
        else
-               controller().params().placement.erase(); // default
+               params.placement.erase(); // default
 }
 
 
 void FormWrap::update()
 {
-       LyXLength len(controller().params().pageWidth);
+       InsetWrapParams const & params = controller().params();
+       LyXLength len(params.width);
        fl_set_input(dialog_->input_width, tostr(len.value()).c_str());
        fl_set_choice(dialog_->choice_width_units, len.unit() + 1);
 
-       if (controller().params().placement.empty())
+       if (params.placement.empty())
                placement_.set(dialog_->radio_default); // default
        else
-               placement_.set(controller().params().placement.c_str()[0]);
+               placement_.set(params.placement.c_str()[0]);
 }
+
+} // namespace frontend
+} // namespace lyx