X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormVSpace.C;h=0df4171318a063df41e775ab37d651e06c756cde;hb=37e82a546392d43f787826b85481a11f2a27af15;hp=648ed57c8843f438b17a1bb3286f136f94ff8b2d;hpb=e1515e6d78ac8c2e7ca1b58bbe9111c812acc6c7;p=lyx.git

diff --git a/src/frontends/xforms/FormVSpace.C b/src/frontends/xforms/FormVSpace.C
index 648ed57c88..0df4171318 100644
--- a/src/frontends/xforms/FormVSpace.C
+++ b/src/frontends/xforms/FormVSpace.C
@@ -33,16 +33,22 @@
 
 #include "lyx_forms.h"
 
-using lyx::support::contains_functor;
-using lyx::support::getStringFromVector;
-using lyx::support::rtrim;
+#include <boost/bind.hpp>
+
+using boost::bind;
 
-using std::bind2nd;
 using std::remove_if;
 
 using std::vector;
 using std::string;
 
+namespace lyx {
+
+using support::contains;
+using support::getStringFromVector;
+using support::rtrim;
+
+namespace frontend {
 
 namespace {
 
@@ -54,14 +60,14 @@ void validateVSpaceWidgets(FL_OBJECT * choice_type, FL_OBJECT * input_length)
 	BOOST_ASSERT(choice_type  && choice_type->objclass  == FL_CHOICE &&
 		     input_length && input_length->objclass == FL_INPUT);
 
-	if (fl_get_choice(choice_type) != 7)
+	if (fl_get_choice(choice_type) != 6)
 		return;
 
 	// If a vspace kind is "Length" but there's no text in
-	// the input field, reset the kind to "None".
+	// the input field, insert nothing.
 	string const input = rtrim(getString(input_length));
 	if (input.empty())
-		fl_set_choice(choice_type, 1);
+		return;
 }
 
 
@@ -75,28 +81,25 @@ VSpace const setVSpaceFromWidgets(FL_OBJECT * choice_type,
 		     input_length  && input_length->objclass  == FL_INPUT &&
 		     choice_length && choice_length->objclass == FL_CHOICE);
 
-	VSpace space = VSpace(VSpace::NONE);
+	VSpace space;
 
 	switch (fl_get_choice(choice_type)) {
 	case 1:
-		space = VSpace(VSpace::NONE);
-		break;
-	case 2:
 		space = VSpace(VSpace::DEFSKIP);
 		break;
-	case 3:
+	case 2:
 		space = VSpace(VSpace::SMALLSKIP);
 		break;
-	case 4:
+	case 3:
 		space = VSpace(VSpace::MEDSKIP);
 		break;
-	case 5:
+	case 4:
 		space = VSpace(VSpace::BIGSKIP);
 		break;
-	case 6:
+	case 5:
 		space = VSpace(VSpace::VFILL);
 		break;
-	case 7:
+	case 6:
 		space = VSpace(LyXGlueLength(
 			getLengthFromWidgets(input_length, choice_length)));
 		break;
@@ -121,26 +124,23 @@ void setWidgetsFromVSpace(VSpace const & space,
 
 	int pos = 1;
 	switch (space.kind()) {
-	case VSpace::NONE:
-		pos = 1;
-		break;
 	case VSpace::DEFSKIP:
-		pos = 2;
+		pos = 1;
 		break;
 	case VSpace::SMALLSKIP:
-		pos = 3;
+		pos = 2;
 		break;
 	case VSpace::MEDSKIP:
-		pos = 4;
+		pos = 3;
 		break;
 	case VSpace::BIGSKIP:
-		pos = 5;
+		pos = 4;
 		break;
 	case VSpace::VFILL:
-		pos = 6;
+		pos = 5;
 		break;
 	case VSpace::LENGTH:
-		pos = 7;
+		pos = 6;
 		break;
 	}
 	fl_set_choice(choice_type, pos);
@@ -195,14 +195,14 @@ void FormVSpace::build()
 	fl_set_input_return(dialog_->input_space, FL_RETURN_CHANGED);
 
 	string const spacing =
-		_("None|DefSkip|SmallSkip|MedSkip|BigSkip|VFill|Length");
+		_("DefSkip|SmallSkip|MedSkip|BigSkip|VFill|Length");
 	fl_addto_choice(dialog_->choice_space, spacing.c_str());
 
 	// Create the contents of the unit choices; don't include the "%" terms.
 	vector<string> units_vec = getLatexUnits();
 	vector<string>::iterator del =
 		remove_if(units_vec.begin(), units_vec.end(),
-			  bind2nd(contains_functor(), "%"));
+			  bind(contains<char>, _1, '%'));
 	units_vec.erase(del, units_vec.end());
 
 	string const units = getStringFromVector(units_vec, "|");
@@ -232,12 +232,8 @@ void FormVSpace::build()
 
 void FormVSpace::apply()
 {
-	if (!form())
-		return;
-
-	// spacing
 	// If a vspace choice is "Length" but there's no text in
-	// the input field, reset the choice to "None".
+	// the input field, insert nothing.
 	validateVSpaceWidgets(dialog_->choice_space, dialog_->input_space);
 
 	VSpace const space =
@@ -259,7 +255,7 @@ void FormVSpace::update()
 			     dialog_->check_keep);
 
 	bool const custom_length =
-		fl_get_choice(dialog_->choice_space) == 7;
+		fl_get_choice(dialog_->choice_space) == 6;
 	setEnabled(dialog_->input_space, custom_length);
 	setEnabled(dialog_->choice_unit_space, custom_length);
 }
@@ -267,13 +263,16 @@ void FormVSpace::update()
 
 ButtonPolicy::SMInput FormVSpace::input(FL_OBJECT * ob, long)
 {
-	// Enable input when custum length is choosen,
-	// disable 'keep' when no space is choosen
+	// Enable input when custom length is chosen,
+	// disable 'keep' when no space is chosen
 	if (ob == dialog_->choice_space) {
 		bool const custom_length =
-			fl_get_choice(dialog_->choice_space) == 7;
+			fl_get_choice(dialog_->choice_space) == 6;
 		setEnabled(dialog_->input_space, custom_length);
 		setEnabled(dialog_->choice_unit_space, custom_length);
 	}
 	return ButtonPolicy::SMI_VALID;
 }
+
+} // namespace frontend
+} // namespace lyx