Bug fix:

If you start LyX and open the Preferences dialog, "Apply" is activated
even though no change has been made so far

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

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 9bb03b50736bf9c55bf240464d9921fe76825e39..e18b1b832c9d56b1beb643220111ec7e16f5ca0a 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-07  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * FormPreferences.C (build): Fix bug: if you start LyX and open the
+       Preferences dialog, "Apply" is activated even though no change has been
+       made so far.
+
 2001-09-07  Rob Lahaye  <lahaye@users.sourceforge.net>
 
        * FormBase.C (show): use controller_.IconifyWithMain() to control

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 4272c2f82b9c1b916d3338af430a2acc3fdb40d3..985c13df26432c2243edb6098c3616738944ad33 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -186,6 +186,12 @@ void FormPreferences::build()
        bc().setCancel(dialog_->button_cancel);
        bc().setRestore(dialog_->button_restore);
 
+       // The first time the dialog is shown, the Apply, Save buttons are
+       // active. On any subsequent showing they aren't (as they shouldn't).
+       // Don't understand why this is so, but this fixes things.
+       // (Angus 7 Sep, 2001)
+       bc().input(ButtonPolicy::SMI_CANCEL);
+
        // build the tab folders
        converters_tab_.reset(build_outer_tab());
        look_n_feel_tab_.reset(build_outer_tab());