From: Angus Leeming <leeming@lyx.org>
Date: Thu, 23 Aug 2001 14:39:18 +0000 (+0000)
Subject: Tentative fix of John's "no point in spell command "None"" bug, #223255.
X-Git-Tag: 1.6.10~20771
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f921515196baaa3f71b6fa220694b9409465bc0c;p=features.git

Tentative fix of John's "no point in spell command "None"" bug, #223255.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2574 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 571d20cf32..8fb1403882 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-21  Angus Leeming  <a.leeming@ic.ac.uk>
+
+	* FormPreferences.C: Tentative fix of John's "no point in spell
+	command "None"" bug, #223255.
+
 2001-08-23  Herbert Voss  <voss@perce.de>
 
 	* FormBibtex.C (input): normalize database list
diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 60a7bc61a3..7a481fd21c 100644
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -2759,6 +2759,7 @@ void FormPreferences::SpellOptions::apply()
 	
 	lyxrc.isp_command = choice;
 
+#if 0
 	// If spell checker == "none", all other input set to off.
 	if (fl_get_choice(dialog_->choice_spell_command) == 1) {
 		lyxrc.isp_use_alt_lang = false;
@@ -2773,6 +2774,7 @@ void FormPreferences::SpellOptions::apply()
 		lyxrc.isp_accept_compound = false;
 		lyxrc.isp_use_input_encoding = false;
 	} else {
+#else
 		int button = fl_get_button(dialog_->check_alt_lang);
 		choice = fl_get_input(dialog_->input_alt_lang);
 		if (button && choice.empty()) button = 0;
@@ -2802,7 +2804,10 @@ void FormPreferences::SpellOptions::apply()
 
 		button = fl_get_button(dialog_->check_input_enc);
 		lyxrc.isp_use_input_encoding = static_cast<bool>(button);
+#endif
+#if 0
 	}
+#endif
 
 	// Reset view
 	update();
@@ -2814,7 +2819,11 @@ void FormPreferences::SpellOptions::build()
 	dialog_.reset(parent_.build_spelloptions());
 
 	fl_addto_choice(dialog_->choice_spell_command,
+#if 0
 			_(" none | ispell | aspell "));
+#else
+			_(" ispell | aspell "));
+#endif
 	fl_set_input_return(dialog_->input_alt_lang,      FL_RETURN_CHANGED);
 	fl_set_input_return(dialog_->input_escape_chars,  FL_RETURN_CHANGED);
 	fl_set_input_return(dialog_->input_personal_dict, FL_RETURN_CHANGED);
@@ -2867,6 +2876,7 @@ bool FormPreferences::SpellOptions::input(FL_OBJECT const * const ob)
 	// objects,
 	// otherwise the function is called by an xforms CB via input().
 
+#if 0
 	// If spell checker == "none", disable all input.
 	if (!ob || ob == dialog_->choice_spell_command) {
 		if (fl_get_choice(dialog_->choice_spell_command) == 1) {
@@ -2887,6 +2897,7 @@ bool FormPreferences::SpellOptions::input(FL_OBJECT const * const ob)
 			fl_activate_object(dialog_->check_input_enc);
 		}
 	}
+#endif
 
 	if (!ob || ob == dialog_->check_alt_lang) {
 		bool const enable = fl_get_button(dialog_->check_alt_lang);
@@ -2917,12 +2928,19 @@ bool FormPreferences::SpellOptions::input(FL_OBJECT const * const ob)
 void FormPreferences::SpellOptions::update()
 {
 	int choice = 1;
+#if 0
 	if (lyxrc.isp_command == "none")
 		choice = 1;
 	else if (lyxrc.isp_command == "ispell")
 		choice = 2;
 	else if (lyxrc.isp_command == "aspell")
 		choice = 3;
+#else
+	if (lyxrc.isp_command == "ispell")
+		choice = 1;
+	else if (lyxrc.isp_command == "aspell")
+		choice = 2;
+#endif
 	fl_set_choice(dialog_->choice_spell_command, choice);
 	
 	string str;