Introduce LFUN_PRINT.

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

diff --git a/src/frontends/xforms/FormTabular.C b/src/frontends/xforms/FormTabular.C
index 0be76f3ff4f3376d96d6fa1e278af3b07a0b02cc..88d0860fad39f4b4116be94c00cf1369805a3ed2 100644 (file)
--- a/src/frontends/xforms/FormTabular.C
+++ b/src/frontends/xforms/FormTabular.C
@@ -5,35 +5,35 @@
  *
  * \author Jürgen Vigna
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#include "ControlTabular.h"
-#include "xformsBC.h"
-#include "ButtonController.h"
-#include "insets/insettabular.h"
-
 #include "FormTabular.h"
+#include "ControlTabular.h"
 #include "forms/form_tabular.h"
-#include "debug.h"
+
 #include "xforms_helpers.h"
-#include "gettext.h"
-#include "lyxrc.h"
-#include "helper_funcs.h"
-#include "input_validators.h"
+#include "xformsBC.h"
+
+#include "controllers/ButtonController.h"
+#include "controllers/helper_funcs.h"
+
 #include "support/lstrings.h"
 
 #include "lyx_forms.h"
 
-#include <vector>
-#include <algorithm>
+#include <boost/bind.hpp>
+
+using lyx::support::contains;
+using lyx::support::getStringFromVector;
+using lyx::support::isStrDbl;
 
-using namespace lyx::support;
+using boost::bind;
 
+using std::string;
 using std::vector;
-using std::bind2nd;
 
 
 namespace {
@@ -84,7 +84,7 @@ void FormTabular::build()
        vector<string> units_vec = getLatexUnits();
        vector<string>::iterator ret =
                remove_if(units_vec.begin(), units_vec.end(),
-                         bind2nd(contains_functor(), "%"));
+                         bind(contains<char>, _1, '%'));
        units_vec.erase(ret, units_vec.end());
        string const units = getStringFromVector(units_vec, "|");
 
@@ -213,9 +213,9 @@ void FormTabular::update()
                align = tabular.getVAlignment(cell);
                fl_set_button(cell_options_->radio_valign_top, 0);
                fl_set_button(cell_options_->radio_valign_bottom, 0);
-               fl_set_button(cell_options_->radio_valign_center, 0);
-               if (pwidth.zero() || (align == LyXTabular::LYX_VALIGN_CENTER))
-                       fl_set_button(cell_options_->radio_valign_center, 1);
+               fl_set_button(cell_options_->radio_valign_middle, 0);
+               if (pwidth.zero() || (align == LyXTabular::LYX_VALIGN_MIDDLE))
+                       fl_set_button(cell_options_->radio_valign_middle, 1);
                else if (align == LyXTabular::LYX_VALIGN_BOTTOM)
                        fl_set_button(cell_options_->radio_valign_bottom, 1);
                else
@@ -237,7 +237,7 @@ void FormTabular::update()
 
                setEnabled(cell_options_->radio_valign_top,    !pwidth.zero());
                setEnabled(cell_options_->radio_valign_bottom, !pwidth.zero());
-               setEnabled(cell_options_->radio_valign_center, !pwidth.zero());
+               setEnabled(cell_options_->radio_valign_middle, !pwidth.zero());
 
                setEnabled(cell_options_->radio_align_left,   true);
                setEnabled(cell_options_->radio_align_right,  true);
@@ -272,8 +272,8 @@ void FormTabular::update()
                fl_set_button(cell_options_->radio_valign_bottom, 0);
                setEnabled(cell_options_->radio_valign_bottom, false);
 
-               fl_set_button(cell_options_->radio_valign_center, 0);
-               setEnabled(cell_options_->radio_valign_center, false);
+               fl_set_button(cell_options_->radio_valign_middle, 0);
+               setEnabled(cell_options_->radio_valign_middle, false);
 
                fl_set_input(cell_options_->input_special_multialign, "");
                setEnabled(cell_options_->input_special_multialign, false);
@@ -342,9 +342,9 @@ void FormTabular::update()
        align = tabular.getVAlignment(cell, true);
        fl_set_button(column_options_->radio_valign_top, 0);
        fl_set_button(column_options_->radio_valign_bottom, 0);
-       fl_set_button(column_options_->radio_valign_center, 0);
-       if (pwidth.zero() || (align == LyXTabular::LYX_VALIGN_CENTER))
-               fl_set_button(column_options_->radio_valign_center, 1);
+       fl_set_button(column_options_->radio_valign_middle, 0);
+       if (pwidth.zero() || (align == LyXTabular::LYX_VALIGN_MIDDLE))
+               fl_set_button(column_options_->radio_valign_middle, 1);
        else if (align == LyXTabular::LYX_VALIGN_BOTTOM)
                fl_set_button(column_options_->radio_valign_bottom, 1);
        else
@@ -356,7 +356,7 @@ void FormTabular::update()
        setEnabled(column_options_->radio_align_block,   !pwidth.zero());
        setEnabled(column_options_->radio_valign_top,    !pwidth.zero());
        setEnabled(column_options_->radio_valign_bottom, !pwidth.zero());
-       setEnabled(column_options_->radio_valign_center, !pwidth.zero());
+       setEnabled(column_options_->radio_valign_middle, !pwidth.zero());
 
        fl_set_button(tabular_options_->check_longtable,
                      tabular.isLongTabular());
@@ -610,8 +610,8 @@ ButtonPolicy::SMInput FormTabular::input(FL_OBJECT * ob, long)
                num = LyXTabular::VALIGN_TOP;
        else if (ob == column_options_->radio_valign_bottom)
                num = LyXTabular::VALIGN_BOTTOM;
-       else if (ob == column_options_->radio_valign_center)
-               num = LyXTabular::VALIGN_CENTER;
+       else if (ob == column_options_->radio_valign_middle)
+               num = LyXTabular::VALIGN_MIDDLE;
        else if (ob == cell_options_->check_multicolumn)
                num = LyXTabular::MULTICOLUMN;
        else if (ob == tabular_options_->check_longtable) {
@@ -675,8 +675,8 @@ ButtonPolicy::SMInput FormTabular::input(FL_OBJECT * ob, long)
                num = LyXTabular::M_VALIGN_TOP;
        else if (ob == cell_options_->radio_valign_bottom)
                num = LyXTabular::M_VALIGN_BOTTOM;
-       else if (ob == cell_options_->radio_valign_center)
-               num = LyXTabular::M_VALIGN_CENTER;
+       else if (ob == cell_options_->radio_valign_middle)
+               num = LyXTabular::M_VALIGN_MIDDLE;
        else
                return ButtonPolicy::SMI_VALID;