Tiny clean-ups.

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

diff --git a/src/frontends/xforms/FormFloat.C b/src/frontends/xforms/FormFloat.C
index 4a86e9c64705037ae4c2f00fa8cbc25bac5077e9..a102a525d8182c28c83c0cc839f2e66ab4e8cdfb 100644 (file)
--- a/src/frontends/xforms/FormFloat.C
+++ b/src/frontends/xforms/FormFloat.C
@@ -7,23 +7,29 @@
  * \author Jürgen Spitzmüller
  * \author Rob Lahaye
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "xformsBC.h"
-#include "ControlFloat.h"
 #include "FormFloat.h"
+#include "ControlFloat.h"
 #include "forms/form_float.h"
+
 #include "Tooltips.h"
 #include "xforms_helpers.h"
+#include "xformsBC.h"
+
+#include "insets/insetfloat.h"
+
 #include "support/lstrings.h"
-#include FORMS_H_LOCATION
+
+#include "lyx_forms.h"
+
+using lyx::support::contains;
+
+using std::string;
+
 
 namespace {
 
@@ -32,14 +38,14 @@ enum {
        HERE_DEFINITELY,
        ALTERNATIVES
 };
- 
+
 } // namespace anon
 
 
-typedef FormCB<ControlFloat, FormDB<FD_float> > base_class;
+typedef FormController<ControlFloat, FormView<FD_float> > base_class;
 
-FormFloat::FormFloat()
-       : base_class(_("Float Options"))
+FormFloat::FormFloat(Dialog & parent)
+       : base_class(parent, _("Float Settings"))
 {}
 
 
@@ -48,21 +54,21 @@ void FormFloat::build()
        dialog_.reset(build_float(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_->radio_default);
-       bc().addReadOnly(dialog_->radio_here_definitely);
-       bc().addReadOnly(dialog_->radio_alternatives);
-       bc().addReadOnly(dialog_->check_top);
-       bc().addReadOnly(dialog_->check_bottom);
-       bc().addReadOnly(dialog_->check_page);
-       bc().addReadOnly(dialog_->check_here);
-       bc().addReadOnly(dialog_->check_force);
-       bc().addReadOnly(dialog_->check_wide);
+       bcview().addReadOnly(dialog_->radio_default);
+       bcview().addReadOnly(dialog_->radio_here_definitely);
+       bcview().addReadOnly(dialog_->radio_alternatives);
+       bcview().addReadOnly(dialog_->check_top);
+       bcview().addReadOnly(dialog_->check_bottom);
+       bcview().addReadOnly(dialog_->check_page);
+       bcview().addReadOnly(dialog_->check_here);
+       bcview().addReadOnly(dialog_->check_force);
+       bcview().addReadOnly(dialog_->check_wide);
 
        placement_.init(dialog_->radio_default,         DOCUMENT_DEFAULTS);
        placement_.init(dialog_->radio_here_definitely, HERE_DEFINITELY);
@@ -99,24 +105,24 @@ void FormFloat::apply()
        case ALTERNATIVES:
                if (fl_get_button(dialog_->check_force)) {
                        // Ignore internal LaTeX rules
-                       placement += "!";
+                       placement += '!';
                }
                if (fl_get_button(dialog_->check_top)) {
                        // Top of page
-                       placement += "t";
+                       placement += 't';
                }
                if (fl_get_button(dialog_->check_bottom)) {
                        // Bottom of page
-                       placement += "b";
+                       placement += 'b';
                }
                if (fl_get_button(dialog_->check_page)) {
                        // Page of floats
-                       placement += "p";
+                       placement += 'p';
                }
                // ignore if wide is selected
                if (!wide && fl_get_button(dialog_->check_here)) {
                        // Here, if possible
-                       placement += "h";
+                       placement += 'h';
                }
                if (placement == "!") {
                        // ignore placement if only force is selected.