Commit fd609b3a authored by Morten Welinder's avatar Morten Welinder

Compilation: don't compile dialogs separately.

This makes more code available to introspection and allows more parallel
compilation.
parent f1d70f5c
......@@ -32,7 +32,6 @@ EXTRA_DIST = \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
xmldocs.make \
libspreadsheet.pc.in \
omf.make \
$(DIST_SAMPLES)
......
......@@ -8,6 +8,7 @@ Morten:
* Enable ssconvert --export-file-per-sheet for html, latex, and pdf.
* Test suite improvements.
* ssconvert improvements.
* Makefile improvements.
--------------------------------------------------------------------------
Gnumeric 1.12.41
......
......@@ -1191,7 +1191,6 @@ icons/256x256/Makefile
icons/256x256/apps/Makefile
introspection/Makefile
src/Makefile
src/dialogs/Makefile
src/widgets/Makefile
src/tools/Makefile
doc/Makefile
......
......@@ -25,7 +25,7 @@ noinst_PROGRAMS = sstest
noinst_HEADERS = dead-kittens.h compilation.h gnm-i18n.h
if WITH_GTK
SUBDIRS += dialogs widgets
SUBDIRS += widgets
bin_PROGRAMS += gnumeric
endif
......@@ -135,6 +135,86 @@ resource_ui_files = \
wilcoxon-mann-whitney.ui \
workbook-attr.ui
dialog_sources = \
dialogs/dao-gui-utils.c \
dialogs/dialog-about.c \
dialogs/dialog-advanced-filter.c \
dialogs/dialog-analysis-tools.c \
dialogs/dialog-analysis-tool-chi-squared.c \
dialogs/dialog-analysis-tool-frequency.c \
dialogs/dialog-analysis-tool-kaplan-meier.c \
dialogs/dialog-analysis-tool-normality.c \
dialogs/dialog-analysis-tool-one-mean.c \
dialogs/dialog-analysis-tool-principal-components.c \
dialogs/dialog-analysis-tool-sign-test.c \
dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c \
dialogs/dialog-autofilter.c \
dialogs/dialog-autoformat.c \
dialogs/dialog-autosave.c \
dialogs/dialog-cell-comment.c \
dialogs/dialog-cell-format.c \
dialogs/dialog-cell-format-cond.c \
dialogs/dialog-cell-sort.c \
dialogs/dialog-col-width.c \
dialogs/dialog-col-row.c \
dialogs/dialog-consolidate.c \
dialogs/dialog-data-slicer.c \
dialogs/dialog-data-table.c \
dialogs/dialog-fill-series.c \
dialogs/dialog-function-select.c \
dialogs/dialog-formula-guru.c \
dialogs/dialog-goal-seek.c \
dialogs/dialog-goto-cell.c \
dialogs/dialog-hyperlink.c \
dialogs/dialog-insert-cells.c \
dialogs/dialog-define-names.c \
dialogs/dialog-delete-cells.c \
dialogs/dialog-merge.c \
dialogs/dialog-password.c \
dialogs/dialog-paste-special.c \
dialogs/dialog-plugin-manager.c \
dialogs/dialog-preferences.c \
dialogs/dialog-random-generator.c \
dialogs/dialog-random-generator-cor.c \
dialogs/dialog-recent.c \
dialogs/dialog-row-height.c \
dialogs/dialog-quit.c \
dialogs/dialog-scenarios.c \
dialogs/dialog-search.c \
dialogs/dialog-search-replace.c \
dialogs/dialog-sheet-compare.c \
dialogs/dialog-sheet-order.c \
dialogs/dialog-sheet-rename.c \
dialogs/dialog-sheet-resize.c \
dialogs/dialog-sheetobject-size.c \
dialogs/dialog-shuffle.c \
dialogs/dialog-simulation.c \
dialogs/dialog-so-list.c \
dialogs/dialog-so-styled.c \
dialogs/dialog-solver.c \
dialogs/dialog-stf.c \
dialogs/dialog-stf-main-page.c \
dialogs/dialog-stf-csv-page.c \
dialogs/dialog-stf-fixed-page.c \
dialogs/dialog-stf-format-page.c \
dialogs/dialog-stf-preview.c \
dialogs/dialog-stf-export.c \
dialogs/dialog-tabulate.c \
dialogs/dialog-doc-metadata.c \
dialogs/dialog-view.c \
dialogs/dialog-workbook-attr.c \
dialogs/dialog-zoom.c \
dialogs/dialog-printer-setup.c
dialog_headers = \
dialogs/help.h \
dialogs/dao-gui-utils.h \
dialogs/dialog-stf.h \
dialogs/dialog-stf-preview.h \
dialogs/dialog-stf-export.h \
dialogs/dialogs.h \
dialogs/tool-dialogs.h
# Another hint, see bugs #172211 and #172212:
non-intermediate: gnm-marshalers.c gnmresources.c
......@@ -159,7 +239,7 @@ libspreadsheet_la_LIBADD = \
$(GNUMERIC_LIBS) \
$(INTLLIBS)
libspreadsheet_la_SOURCES = \
libspreadsheet_la_SOURCES = \
go-val.h \
go-val.c \
\
......@@ -302,7 +382,8 @@ libspreadsheet_la_SOURCES = \
workbook-view.c \
workbook.c \
xml-sax-read.c \
xml-sax-write.c
xml-sax-write.c \
$(dialog_sources)
nodist_libspreadsheet_la_SOURCES = gnmresources.c gnmresources.h
......@@ -310,7 +391,7 @@ nodist_libspreadsheet_la_SOURCES = gnmresources.c gnmresources.h
# libspreadsheet-ver/spreadsheet/header
# doing it now would require massive cvs surgery.
libspreadsheet_includedir = $(includedir)/libspreadsheet-@GNUMERIC_API_VER@/spreadsheet
libspreadsheet_include_HEADERS = \
libspreadsheet_include_HEADERS = \
application.h \
auto-format.h \
cell-draw.h \
......@@ -355,9 +436,9 @@ libspreadsheet_include_HEADERS = \
gnumeric-fwd.h \
gnumeric-simple-canvas.h \
gnumeric.h \
go-data-cache-field.h \
go-data-cache-source.h \
go-data-cache.h \
go-data-cache-field.h \
go-data-cache-source.h \
go-data-cache.h \
go-data-slicer-field.h \
go-data-slicer.h \
go-val.h \
......@@ -401,9 +482,9 @@ libspreadsheet_include_HEADERS = \
sheet-autofill.h \
sheet-control-gui-priv.h \
sheet-control-gui.h \
sheet-control-priv.h \
sheet-control.h \
sheet-diff.h \
sheet-control-priv.h \
sheet-control.h \
sheet-diff.h \
sheet-filter-combo.h \
sheet-filter.h \
sheet-merge.h \
......@@ -418,7 +499,7 @@ libspreadsheet_include_HEADERS = \
sheet-private.h \
sheet-style.h \
sheet-utils.h \
sheet-view.h \
sheet-view.h \
sheet.h \
sort.h \
stf-export.h \
......@@ -436,13 +517,14 @@ libspreadsheet_include_HEADERS = \
wbc-gtk-impl.h \
wbc-gtk.h \
workbook-cmd-format.h \
workbook-control-priv.h \
workbook-control.h \
workbook-control-priv.h \
workbook-control.h \
workbook-priv.h \
workbook-view.h \
workbook.h \
xml-io-version.h \
xml-sax.h
xml-sax.h \
$(dialog_headers)
gnumeric_SOURCES = \
io-context-gtk.c \
......@@ -518,7 +600,6 @@ stamp-local.def: $(libspreadsheet_include_HEADERS) Makefile $(top_srcdir)/tools/
endif
gnumeric_app_libs = \
dialogs/libdialogs.la \
tools/libtools.la \
widgets/libwidgets.la
......
Makefile.in
Makefile
.deps
*.bak
#
# Keep this in sync with ../../icons/Makefile.am
#
AM_CPPFLAGS = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGNUMERIC_DATADIR=\""$(gnumeric_datadir)"\" \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/tools \
-DGNUMERIC_INTERNAL \
$(GNUMERIC_CFLAGS)
noinst_LTLIBRARIES = libdialogs.la
libdialogs_la_SOURCES = \
help.h \
dao-gui-utils.c \
dao-gui-utils.h \
dialog-about.c \
dialog-advanced-filter.c \
dialog-analysis-tools.c \
dialog-analysis-tool-chi-squared.c \
dialog-analysis-tool-frequency.c \
dialog-analysis-tool-kaplan-meier.c \
dialog-analysis-tool-normality.c \
dialog-analysis-tool-one-mean.c \
dialog-analysis-tool-principal-components.c \
dialog-analysis-tool-sign-test.c \
dialog-analysis-tool-wilcoxon-mann-whitney.c \
dialog-autofilter.c \
dialog-autoformat.c \
dialog-autosave.c \
dialog-cell-comment.c \
dialog-cell-format.c \
dialog-cell-format-cond.c \
dialog-cell-sort.c \
dialog-col-width.c \
dialog-col-row.c \
dialog-consolidate.c \
dialog-data-slicer.c \
dialog-data-table.c \
dialog-fill-series.c \
dialog-function-select.c \
dialog-formula-guru.c \
dialog-goal-seek.c \
dialog-goto-cell.c \
dialog-hyperlink.c \
dialog-insert-cells.c \
dialog-define-names.c \
dialog-delete-cells.c \
dialog-merge.c \
dialog-password.c \
dialog-paste-special.c \
dialog-plugin-manager.c \
dialog-preferences.c \
dialog-random-generator.c \
dialog-random-generator-cor.c \
dialog-recent.c \
dialog-row-height.c \
dialog-quit.c \
dialog-scenarios.c \
dialog-search.c \
dialog-search-replace.c \
dialog-sheet-compare.c \
dialog-sheet-order.c \
dialog-sheet-rename.c \
dialog-sheet-resize.c \
dialog-sheetobject-size.c \
dialog-shuffle.c \
dialog-simulation.c \
dialog-so-list.c \
dialog-so-styled.c \
dialog-solver.c \
dialog-stf.c \
dialog-stf.h \
dialog-stf-main-page.c \
dialog-stf-csv-page.c \
dialog-stf-fixed-page.c \
dialog-stf-format-page.c \
dialog-stf-preview.c \
dialog-stf-preview.h \
dialog-stf-export.c \
dialog-stf-export.h \
dialog-tabulate.c \
dialog-doc-metadata.c \
dialog-view.c \
dialog-workbook-attr.c \
dialog-zoom.c \
dialogs.h \
embedded-ui.h \
tool-dialogs.h \
dialog-printer-setup.c
......@@ -44,7 +44,7 @@
**/
void
dialog_tool_preset_to_range (GenericToolState *state)
dialog_tool_preset_to_range (GnmGenericToolState *state)
{
GnmRange const *sel;
GtkWidget *w;
......@@ -63,7 +63,7 @@ dialog_tool_preset_to_range (GenericToolState *state)
/**
* dialog_tool_init_outputs:
* dialog_tool_init_outputs: (skip)
* @state:
* @sensitivity_cb:
*
......@@ -71,7 +71,7 @@ dialog_tool_preset_to_range (GenericToolState *state)
*
**/
void
dialog_tool_init_outputs (GenericToolState *state, GCallback sensitivity_cb)
dialog_tool_init_outputs (GnmGenericToolState *state, GCallback sensitivity_cb)
{
GtkWidget *dao_box;
......@@ -91,20 +91,17 @@ dialog_tool_init_outputs (GenericToolState *state, GCallback sensitivity_cb)
G_CALLBACK (sensitivity_cb), state);
gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->gdao));
return;
}
/**
* parse_output:
*
* parse_output: (skip)
* @state:
* @dao:
*
* fill dao with information from the standard output section of a dialog
*/
data_analysis_output_t *
parse_output (GenericToolState *state, data_analysis_output_t *dao)
parse_output (GnmGenericToolState *state, data_analysis_output_t *dao)
{
data_analysis_output_t *this_dao = dao;
......
......@@ -34,9 +34,9 @@
#include "tools/dao.h"
void dialog_tool_init_outputs (GenericToolState *state, GCallback sensitivity_cb);
data_analysis_output_t *parse_output (GenericToolState *state, data_analysis_output_t *dao);
void dialog_tool_preset_to_range (GenericToolState *state);
void dialog_tool_init_outputs (GnmGenericToolState *state, GCallback sensitivity_cb);
data_analysis_output_t *parse_output (GnmGenericToolState *state, data_analysis_output_t *dao);
void dialog_tool_preset_to_range (GnmGenericToolState *state);
#endif
......@@ -47,7 +47,7 @@
#define ADVANCED_FILTER_KEY "advanced-filter-dialog"
typedef GenericToolState AdvancedFilterState;
typedef GnmGenericToolState AdvancedFilterState;
/**
* advanced_filter_update_sensitivity_cb:
......@@ -122,7 +122,7 @@ advanced_filter_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
criteria = gnm_expr_entry_parse_as_value
(state->input_entry_2, state->sheet);
dao = parse_output ((GenericToolState *) state, NULL);
dao = parse_output ((GnmGenericToolState *) state, NULL);
w = go_gtk_builder_get_widget (state->gui, "unique-button");
unique = (1 == gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)));
......@@ -158,7 +158,7 @@ advanced_filter_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
gtk_widget_destroy (state->dialog);
break;
case analysis_tools_invalid_field:
error_in_entry ((GenericToolState *) state,
error_in_entry ((GnmGenericToolState *) state,
GTK_WIDGET (state->input_entry_2),
_("The given criteria are invalid."));
break;
......@@ -171,7 +171,7 @@ advanced_filter_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
default:
text = g_strdup_printf (_("An unexpected error has occurred: "
"%d."), err);
error_in_entry ((GenericToolState *) state,
error_in_entry ((GnmGenericToolState *) state,
GTK_WIDGET (state->input_entry), text);
g_free (text);
break;
......@@ -182,10 +182,8 @@ advanced_filter_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
/**
* dialog_advanced_filter:
* @wbcg:
* @sheet:
*
* Show the dialog (guru).
*
**/
void
dialog_advanced_filter (WBCGtk *wbcg)
......@@ -216,7 +214,7 @@ dialog_advanced_filter (WBCGtk *wbcg)
gnm_dao_set_inplace (GNM_DAO (state->gdao), _("Filter _in-place"));
gnm_dao_set_put (GNM_DAO (state->gdao), FALSE, FALSE);
advanced_filter_update_sensitivity_cb (NULL, state);
tool_load_selection ((GenericToolState *)state, TRUE);
tool_load_selection ((GnmGenericToolState *)state, TRUE);
return;
}
......@@ -55,7 +55,7 @@
#define CHI_SQUARED_I_KEY "analysistools-chi-square-independence-dialog"
typedef struct {
GenericToolState base;
GnmGenericToolState base;
GtkWidget *alpha_entry;
GtkWidget *label;
} ChiSquaredIToolState;
......@@ -78,7 +78,7 @@ chi_squared_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
analysis_tools_data_chi_squared_t *data;
data = g_new0 (analysis_tools_data_chi_squared_t, 1);
dao = parse_output ((GenericToolState *)state, NULL);
dao = parse_output ((GnmGenericToolState *)state, NULL);
data->input = gnm_expr_entry_parse_as_value
(GNM_EXPR_ENTRY (state->base.input_entry),
......@@ -248,7 +248,7 @@ dialog_chi_square_tool (WBCGtk *wbcg, Sheet *sheet, gboolean independence)
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
chi_squared_tool_update_sensitivity_cb (NULL, state);
tool_load_selection ((GenericToolState *)state, TRUE);
tool_load_selection ((GnmGenericToolState *)state, TRUE);
return 0;
}
......@@ -68,7 +68,7 @@ static char const * const chart_group[] = {
};
typedef struct {
GenericToolState base;
GnmGenericToolState base;
GtkWidget *predetermined_button;
GtkWidget *calculated_button;
GtkEntry *n_entry;
......@@ -154,7 +154,7 @@ frequency_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
GtkWidget *w;
data = g_new0 (analysis_tools_data_frequency_t, 1);
dao = parse_output ((GenericToolState *)state, NULL);
dao = parse_output ((GnmGenericToolState *)state, NULL);
data->base.input = gnm_expr_entry_parse_as_list (
GNM_EXPR_ENTRY (state->base.input_entry), state->base.sheet);
......@@ -291,7 +291,7 @@ dialog_frequency_tool (WBCGtk *wbcg, Sheet *sheet)
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
frequency_tool_update_sensitivity_cb (NULL, state);
tool_load_selection ((GenericToolState *)state, TRUE);
tool_load_selection ((GnmGenericToolState *)state, TRUE);
gtk_widget_set_sensitive (GTK_WIDGET (state->n_entry), FALSE);
gtk_widget_set_sensitive (state->calculated_button, FALSE);
......
......@@ -55,7 +55,7 @@
#define KAPLAN_MEIER_KEY "analysistools-kaplan-meier-dialog"
typedef struct {
GenericToolState base;
GnmGenericToolState base;
GtkWidget *censorship_button;
GtkWidget *censor_spin_from;
GtkWidget *censor_spin_to;
......@@ -249,7 +249,7 @@ kaplan_meier_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
analysis_tools_data_kaplan_meier_t *data;
data = g_new0 (analysis_tools_data_kaplan_meier_t, 1);
dao = parse_output ((GenericToolState *)state, NULL);
dao = parse_output ((GnmGenericToolState *)state, NULL);
data->base.wbc = GNM_WBC (state->base.wbcg);
......@@ -736,7 +736,7 @@ dialog_kaplan_meier_tool (WBCGtk *wbcg, Sheet *sheet)
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
kaplan_meier_tool_update_sensitivity_cb (NULL, state);
kaplan_meier_tool_update_groups_sensitivity_cb (NULL, state);
tool_load_selection ((GenericToolState *)state, TRUE);
tool_load_selection ((GnmGenericToolState *)state, TRUE);
gtk_widget_show_all (GTK_WIDGET (state->base.dialog));
/* And to hide the in-place button again */
......
......@@ -55,7 +55,7 @@
#define NORMALITY_KEY "analysistools-normality-dialog"
typedef struct {
GenericToolState base;
GnmGenericToolState base;
GtkWidget *alpha_entry;
} NormalityTestsToolState;
......@@ -144,7 +144,7 @@ normality_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
analysis_tools_data_normality_t *data;
data = g_new0 (analysis_tools_data_normality_t, 1);
dao = parse_output ((GenericToolState *)state, NULL);
dao = parse_output ((GnmGenericToolState *)state, NULL);
data->base.input = gnm_expr_entry_parse_as_list (
GNM_EXPR_ENTRY (state->base.input_entry), state->base.sheet);
......@@ -218,7 +218,7 @@ dialog_normality_tool (WBCGtk *wbcg, Sheet *sheet)
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
normality_tool_update_sensitivity_cb (NULL, state);
tool_load_selection ((GenericToolState *)state, TRUE);
tool_load_selection ((GnmGenericToolState *)state, TRUE);
return 0;
}
......@@ -62,7 +62,7 @@ static char const * const grouped_by_group[] = {
};
typedef struct {
GenericToolState base;
GnmGenericToolState base;
GtkWidget *alpha_entry;
GtkWidget *mean_entry;
} OneeMeanTestToolState;
......@@ -137,7 +137,7 @@ one_mean_test_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
analysis_tools_data_one_mean_test_t *data;
data = g_new0 (analysis_tools_data_one_mean_test_t, 1);
dao = parse_output ((GenericToolState *)state, NULL);
dao = parse_output ((GnmGenericToolState *)state, NULL);
data->base.input = gnm_expr_entry_parse_as_list (
GNM_EXPR_ENTRY (state->base.input_entry), state->base.sheet);
......@@ -247,7 +247,7 @@ dialog_one_mean_test_tool (WBCGtk *wbcg, Sheet *sheet)
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
one_mean_test_tool_update_sensitivity_cb (NULL, state);
tool_load_selection ((GenericToolState *)state, TRUE);
tool_load_selection ((GnmGenericToolState *)state, TRUE);
return 0;
......
......@@ -63,7 +63,7 @@ static char const * const grouped_by_group[] = {
static void
principal_components_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
GenericToolState *state)
GnmGenericToolState *state)
{
GSList *input_range;
......@@ -101,7 +101,7 @@ principal_components_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
**/
static void
principal_components_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
GenericToolState *state)
GnmGenericToolState *state)
{
data_analysis_output_t *dao;
analysis_tools_data_generic_t *data;
......@@ -128,7 +128,7 @@ principal_components_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
char *text;
text = g_strdup_printf (
_("An unexpected error has occurred."));
error_in_entry ((GenericToolState *) state,
error_in_entry ((GnmGenericToolState *) state,
GTK_WIDGET (state->input_entry), text);
g_free (text);
} else
......@@ -149,7 +149,7 @@ principal_components_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
int
dialog_principal_components_tool (WBCGtk *wbcg, Sheet *sheet)
{
GenericToolState *state;
GnmGenericToolState *state;
char const * plugins[] = { "Gnumeric_fnstat",
"Gnumeric_fnmath",
"Gnumeric_fnlogical",
......@@ -163,7 +163,7 @@ dialog_principal_components_tool (WBCGtk *wbcg, Sheet *sheet)
if (gnm_dialog_raise_if_exists (wbcg, PRINCIPAL_COMPONENTS_KEY))
return 0;
state = g_new0 (GenericToolState, 1);
state = g_new0 (GnmGenericToolState, 1);
if (dialog_tool_init (state, wbcg, sheet,
GNUMERIC_HELP_LINK_PRINCIPAL_COMPONENTS,
......@@ -177,7 +177,7 @@ dialog_principal_components_tool (WBCGtk *wbcg, Sheet *sheet)
gnm_dao_set_put (GNM_DAO (state->gdao), TRUE, TRUE);
principal_components_tool_update_sensitivity_cb (NULL, state);
tool_load_selection ((GenericToolState *)state, TRUE);
tool_load_selection ((GnmGenericToolState *)state, TRUE);
return 0;
}
......@@ -64,7 +64,7 @@ static char const * const grouped_by_group[] = {
};
typedef struct {
GenericToolState base;
GnmGenericToolState base;
GtkWidget *alpha_entry;
GtkWidget *median_entry;
} SignTestToolState;
......@@ -118,7 +118,7 @@ sign_test_tool_update_common_sensitivity_cb (SignTestToolState *state)
/**
* sign_test_tool_update_sensitivity_cb:
* sign_test_two_tool_update_sensitivity_cb:
* @dummy:
* @state:
*
......@@ -126,7 +126,7 @@ sign_test_tool_update_common_sensitivity_cb (SignTestToolState *state)
**/
static void
sign_test_two_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
SignTestToolState *state)
SignTestToolState *state)
{
GnmValue *input_range;
gint w, h;
......@@ -195,7 +195,7 @@ sign_test_two_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
analysis_tool_engine engine;
data = g_new0 (analysis_tools_data_sign_test_two_t, 1);
dao = parse_output ((GenericToolState *)state, NULL);
dao = parse_output ((GnmGenericToolState *)state, NULL);
data->base.range_1 = gnm_expr_entry_parse_as_value
(GNM_EXPR_ENTRY (state->base.input_entry), state->base.sheet);
......@@ -285,7 +285,7 @@ dialog_sign_test_two_tool (WBCGtk *wbcg, Sheet *sheet, signtest_type type)
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
sign_test_two_tool_update_sensitivity_cb (NULL, state);
tool_load_selection ((GenericToolState *)state, TRUE);
tool_load_selection ((GnmGenericToolState *)state, TRUE);
return 0;
......@@ -312,7 +312,7 @@ sign_test_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
analysis_tool_engine engine;
data = g_new0 (analysis_tools_data_sign_test_t, 1);
dao = parse_output ((GenericToolState *)state, NULL);
dao = parse_output ((GnmGenericToolState *)state, NULL);
data->base.input = gnm_expr_entry_parse_as_list (
GNM_EXPR_ENTRY (state->base.input_entry), state->base.sheet);
......@@ -433,7 +433,7 @@ dialog_sign_test_tool (WBCGtk *wbcg, Sheet *sheet, signtest_type type)
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
sign_test_tool_update_sensitivity_cb (NULL, state);
tool_load_selection ((GenericToolState *)state, TRUE);
tool_load_selection ((GnmGenericToolState *)state, TRUE);
return 0;
......
......@@ -63,7 +63,7 @@ static char const * const grouped_by_group[] = {
static void
wilcoxon_mann_whitney_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy,
GenericToolState *state)
GnmGenericToolState *state)
{
GnmValue *input_range;
GnmValue *input_range_2;
......@@ -116,7 +116,7 @@ wilcoxon_mann_whitney_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy
**/
static void
wilcoxon_mann_whitney_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
GenericToolState *state)
GnmGenericToolState *state)
{
data_analysis_output_t *dao;
analysis_tools_data_generic_b_t *data;
......@@ -166,7 +166,7 @@ wilcoxon_mann_whitney_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
int
dialog_wilcoxon_m_w_tool (WBCGtk *wbcg, Sheet *sheet)
{
GenericToolState *state;
GnmGenericToolState *state;
char const * plugins[] = { "Gnumeric_fnstat",
"Gnumeric_fnmath",
"Gnumeric_fnlookup",
......@@ -180,7 +180,7 @@ dialog_wilcoxon_m_w_tool (WBCGtk *wbcg, Sheet *sheet)
if (gnm_dialog_raise_if_exists (wbcg, WILCOXON_MANN_WHITNEY_KEY))
return 0;
state = g_new0 (GenericToolState, 1);
state = g_new0 (GnmGenericToolState, 1);
if (dialog_tool_init (state, wbcg, sheet,
GNUMERIC_HELP_LINK_WILCOXON_MANN_WHITNEY,
......@@ -194,7 +194,7 @@ dialog_wilcoxon_m_w_tool (WBCGtk *wbcg, Sheet *sheet)
gnm_dao_set_put (GNM_DAO (state->gdao), TRUE, TRUE);
wilcoxon_mann_whitney_tool_update_sensitivity_cb (NULL, state);
tool_load_selection ((GenericToolState *)state, TRUE);
tool_load_selection ((GnmGenericToolState *)state, TRUE);
return 0;
}
This diff is collapsed.
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/**
/*
* dialog-autofilter.c: A pair of dialogs for autofilter conditions
*
* (c) Copyright 2002 Jody Goldberg <jody@gnome.org>
......
......@@ -499,7 +499,7 @@ cb_canvas_focus (GtkWidget *canvas,
/**
* dialog_autoformat:
* @wb: The Workbook
* @wbcg: the control that invoked this dialog
*
* This function will show the AutoFormatTemplate dialog and apply
* the template the user chooses to the current selection in the active
......