[gnumeric] Fix sensitivity tests for 2-factor anova dialog. [#693980]

[Andreas J. Guelzow <guelzow src gnome org>]

commit bd8091b3ba67e13d454e8f999356a684df544899
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Sun Feb 17 21:33:21 2013 -0700

    Fix sensitivity tests for 2-factor anova dialog. [#693980]
    
    2013-02-17  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * analysis-anova.c (analysis_tool_anova_two_factor_no_rep_engine_run):
        fix enum type
    
    2013-02-17  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * dialog-analysis-tools.c (average_tool_update_sensitivity_cb): fix test
        (average_tool_*_cb): call average_tool_update_sensitivity_cb

 NEWS                                |    1 +
 src/dialogs/ChangeLog               |    5 +++++
 src/dialogs/dialog-analysis-tools.c |   10 +++++++++-
 src/tools/ChangeLog                 |    5 +++++
 src/tools/analysis-anova.c          |    8 ++++----
 5 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/NEWS b/NEWS
index 4995739..aec1342 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Andreas:
        * Show argument names for python functions. [#690681]
        * Fix loading of ODF files with named expressions. [#690925]
        * Avoid unncessary sheet specification in analysis tools. [#691892]
+       * Fix sensitivity tests for 2-factor anova dialog. [#693980]
 
 Jean:
        * Fixed aspect ratio for graph sheets. [#691472]
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index b798852..9d26fed 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-17  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * dialog-analysis-tools.c (average_tool_update_sensitivity_cb): fix test
+       (average_tool_*_cb): call average_tool_update_sensitivity_cb
+
 2013-02-16  Jean Brefort  <jean brefort normalesup org>
 
        * dialog-stf-format-page.c (stf_dialog_format_page_init): replaced GtkTable
diff --git a/src/dialogs/dialog-analysis-tools.c b/src/dialogs/dialog-analysis-tools.c
index 7e50e24..8d3e4fa 100644
--- a/src/dialogs/dialog-analysis-tools.c
+++ b/src/dialogs/dialog-analysis-tools.c
@@ -122,6 +122,10 @@ static char const * const n_group[] = {
        NULL
 };
 
+/* Note: the items in this group need to match */
+/*       moving_average_type_t except that     */
+/*       moving_average_type_central_sma is a  */
+/*       subtype of moving_average_type_sma.   */
 static char const * const moving_average_group[] = {
        "sma-button",
        "cma-button",
@@ -2907,7 +2911,7 @@ average_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
 
        type = gnm_gui_group_value (state->base.gui, moving_average_group);
 
-       if (type == moving_average_type_sma || moving_average_type_wma) {
+       if ((type == moving_average_type_sma) || (type == moving_average_type_wma)) {
                err = entry_to_int (GTK_ENTRY (state->interval_entry),
                                    &interval, FALSE);
                if (err!= 0 || interval <= 0)  {
@@ -3006,6 +3010,7 @@ average_tool_sma_cb (GtkToggleButton *togglebutton, gpointer user_data)
        gtk_widget_set_sensitive (state->offset_button, TRUE);
        gtk_widget_set_sensitive (state->interval_entry, TRUE);
        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (state->prior_button), TRUE);
+       average_tool_update_sensitivity_cb (NULL, state);
 }
 
 static void
@@ -3021,6 +3026,7 @@ average_tool_cma_cb (GtkToggleButton *togglebutton, gpointer user_data)
        gtk_widget_set_sensitive (state->central_button, FALSE);
        gtk_widget_set_sensitive (state->offset_button, FALSE);
        gtk_widget_set_sensitive (state->interval_entry, FALSE);
+       average_tool_update_sensitivity_cb (NULL, state);
 }
 
 static void
@@ -3035,6 +3041,7 @@ average_tool_wma_cb (GtkToggleButton *togglebutton, gpointer user_data)
        gtk_widget_set_sensitive (state->central_button, FALSE);
        gtk_widget_set_sensitive (state->offset_button, FALSE);
        gtk_widget_set_sensitive (state->interval_entry, TRUE);
+       average_tool_update_sensitivity_cb (NULL, state);
 }
 
 static void
@@ -3050,6 +3057,7 @@ average_tool_spencer_cb (GtkToggleButton *togglebutton, gpointer user_data)
        gtk_widget_set_sensitive (state->central_button, FALSE);
        gtk_widget_set_sensitive (state->offset_button, FALSE);
        gtk_widget_set_sensitive (state->interval_entry, FALSE);
+       average_tool_update_sensitivity_cb (NULL, state);
 }
 
 /**
diff --git a/src/tools/ChangeLog b/src/tools/ChangeLog
index d6d6253..b243b69 100644
--- a/src/tools/ChangeLog
+++ b/src/tools/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-17  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * analysis-anova.c (analysis_tool_anova_two_factor_no_rep_engine_run):
+       fix enum type
+
 2013-01-24  Andreas J. Guelzow <aguelzow pyrshep ca>
 
        * dao.c (dao_get_cellref_full): new
diff --git a/src/tools/analysis-anova.c b/src/tools/analysis-anova.c
index 30dc2a8..6bd41d8 100644
--- a/src/tools/analysis-anova.c
+++ b/src/tools/analysis-anova.c
@@ -244,9 +244,9 @@ analysis_tool_anova_two_factor_no_rep_engine_run (data_analysis_output_t *dao,
                                        "/Total"));
        dao_set_italic (dao, 1, r, 6, r);
        dao_set_border (dao, 0, r, 6, r, MSTYLE_BORDER_BOTTOM, GNM_STYLE_BORDER_THIN,
-                       style_color_black (), GNM_STYLE_BORDER_HORIZ);
+                       style_color_black (), GNM_STYLE_BORDER_HORIZONTAL);
        dao_set_border (dao, 0, r+3, 6, r+3, MSTYLE_BORDER_BOTTOM, GNM_STYLE_BORDER_THIN,
-                       style_color_black (), GNM_STYLE_BORDER_HORIZ);
+                       style_color_black (), GNM_STYLE_BORDER_HORIZONTAL);
        set_cell_text_row (dao, 1, r, _("/SS"
                                        "/df"
                                        "/MS"
@@ -603,9 +603,9 @@ analysis_tool_anova_two_factor_engine_run (data_analysis_output_t *dao,
                                        "/Total"));
        dao_set_italic (dao, 1, r, 6, r);
        dao_set_border (dao, 0, r, 6, r, MSTYLE_BORDER_BOTTOM, GNM_STYLE_BORDER_THIN,
-                       style_color_black (), GNM_STYLE_BORDER_HORIZ);
+                       style_color_black (), GNM_STYLE_BORDER_HORIZONTAL);
        dao_set_border (dao, 0, r+4, 6, r+4, MSTYLE_BORDER_BOTTOM, GNM_STYLE_BORDER_THIN,
-                       style_color_black (), GNM_STYLE_BORDER_HORIZ);
+                       style_color_black (), GNM_STYLE_BORDER_HORIZONTAL);
        set_cell_text_row (dao, 1, r, _("/SS"
                                        "/df"
                                        "/MS"