From 64a18d9cb2657b541ebf39c9a064edc92101f2f3 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Tue, 11 May 2010 10:07:52 +0200
Subject: [PATCH] Change gpointer variable to PsppireDataWindow * in dialog
 function signatures

---
 src/ui/gui/comments-dialog.c                   | 3 +--
 src/ui/gui/comments-dialog.h                   | 4 +++-
 src/ui/gui/compute-dialog.c                    | 3 +--
 src/ui/gui/compute-dialog.h                    | 3 ++-
 src/ui/gui/correlation-dialog.c                | 3 +--
 src/ui/gui/correlation-dialog.h                | 3 ++-
 src/ui/gui/crosstabs-dialog.c                  | 4 +---
 src/ui/gui/crosstabs-dialog.h                  | 4 ++--
 src/ui/gui/descriptives-dialog.c               | 3 +--
 src/ui/gui/descriptives-dialog.h               | 3 ++-
 src/ui/gui/examine-dialog.c                    | 3 +--
 src/ui/gui/examine-dialog.h                    | 3 ++-
 src/ui/gui/factor-dialog.c                     | 4 ++--
 src/ui/gui/factor-dialog.h                     | 3 ++-
 src/ui/gui/find-dialog.c                       | 4 +---
 src/ui/gui/find-dialog.h                       | 4 ++--
 src/ui/gui/frequencies-dialog.c                | 3 +--
 src/ui/gui/frequencies-dialog.h                | 3 ++-
 src/ui/gui/goto-case-dialog.c                  | 4 +---
 src/ui/gui/goto-case-dialog.h                  | 3 ++-
 src/ui/gui/oneway-anova-dialog.c               | 3 +--
 src/ui/gui/oneway-anova-dialog.h               | 4 +++-
 src/ui/gui/rank-dialog.c                       | 3 +--
 src/ui/gui/rank-dialog.h                       | 4 ++--
 src/ui/gui/recode-dialog.c                     | 8 ++------
 src/ui/gui/recode-dialog.h                     | 6 +++---
 src/ui/gui/regression-dialog.c                 | 3 +--
 src/ui/gui/regression-dialog.h                 | 4 ++--
 src/ui/gui/reliability-dialog.c                | 3 +--
 src/ui/gui/reliability-dialog.h                | 4 ++--
 src/ui/gui/roc-dialog.c                        | 3 +--
 src/ui/gui/roc-dialog.h                        | 4 ++--
 src/ui/gui/select-cases-dialog.c               | 3 +--
 src/ui/gui/select-cases-dialog.h               | 5 ++---
 src/ui/gui/sort-cases-dialog.c                 | 3 +--
 src/ui/gui/sort-cases-dialog.h                 | 5 ++---
 src/ui/gui/split-file-dialog.c                 | 3 +--
 src/ui/gui/split-file-dialog.h                 | 5 ++---
 src/ui/gui/t-test-independent-samples-dialog.c | 3 +--
 src/ui/gui/t-test-independent-samples-dialog.h | 4 +++-
 src/ui/gui/t-test-one-sample.c                 | 3 +--
 src/ui/gui/t-test-one-sample.h                 | 4 +++-
 src/ui/gui/t-test-paired-samples.c             | 3 +--
 src/ui/gui/t-test-paired-samples.h             | 4 +++-
 src/ui/gui/transpose-dialog.c                  | 3 +--
 src/ui/gui/transpose-dialog.h                  | 5 ++---
 src/ui/gui/variable-info-dialog.c              | 4 +---
 src/ui/gui/variable-info-dialog.h              | 4 ++--
 src/ui/gui/weight-cases-dialog.c               | 3 +--
 src/ui/gui/weight-cases-dialog.h               | 5 ++---
 50 files changed, 83 insertions(+), 102 deletions(-)

diff --git a/src/ui/gui/comments-dialog.c b/src/ui/gui/comments-dialog.c
index d8714e7f..768fe476 100644
--- a/src/ui/gui/comments-dialog.c
+++ b/src/ui/gui/comments-dialog.c
@@ -91,11 +91,10 @@ wrap_line (GtkTextBuffer *buffer,
 
 
 void
-comments_dialog (gpointer data)
+comments_dialog (PsppireDataWindow *de)
 {
   GtkTextIter iter;
   gint response ;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
   struct comment_dialog cd;
 
   GtkBuilder *xml = builder_new ("psppire.ui");
diff --git a/src/ui/gui/comments-dialog.h b/src/ui/gui/comments-dialog.h
index d53283b9..9295d4c3 100644
--- a/src/ui/gui/comments-dialog.h
+++ b/src/ui/gui/comments-dialog.h
@@ -18,6 +18,8 @@
 #ifndef COMMENTS_DIALOG_H
 #define COMMENTS_DIALOG_H
 
-void comments_dialog (gpointer data);
+#include "psppire-data-window.h"
+
+void comments_dialog (PsppireDataWindow * data);
 
 #endif /*  COMMENTS_DIALOG_H */
diff --git a/src/ui/gui/compute-dialog.c b/src/ui/gui/compute-dialog.c
index 4e0eb371..d70bdcce 100644
--- a/src/ui/gui/compute-dialog.c
+++ b/src/ui/gui/compute-dialog.c
@@ -363,10 +363,9 @@ contents_plausible (gpointer data)
 
 /* Pops up the Compute dialog box */
 void
-compute_dialog (gpointer data)
+compute_dialog (PsppireDataWindow *de)
 {
   gint response;
-  PsppireDataWindow *de = data;
 
   PsppireVarStore *vs = NULL;
   struct compute_dialog scd;
diff --git a/src/ui/gui/compute-dialog.h b/src/ui/gui/compute-dialog.h
index 5267cdd0..4594f5c2 100644
--- a/src/ui/gui/compute-dialog.h
+++ b/src/ui/gui/compute-dialog.h
@@ -19,7 +19,8 @@
 
 
 #include <gtk/gtk.h>
+#include "psppire-data-window.h"
 
-void compute_dialog (gpointer data);
+void compute_dialog (PsppireDataWindow * data);
 
 #endif
diff --git a/src/ui/gui/correlation-dialog.c b/src/ui/gui/correlation-dialog.c
index 82a053a3..3561170d 100644
--- a/src/ui/gui/correlation-dialog.c
+++ b/src/ui/gui/correlation-dialog.c
@@ -83,13 +83,12 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the Correlation dialog box */
 void
-correlation_dialog (gpointer data)
+correlation_dialog (PsppireDataWindow *de)
 {
   struct correlation rd;
   gint response;
 
   GtkBuilder *xml = builder_new ("correlation.ui");
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
   PsppireVarStore *vs;
 
   GtkWidget *dialog = get_widget_assert   (xml, "correlation-dialog");
diff --git a/src/ui/gui/correlation-dialog.h b/src/ui/gui/correlation-dialog.h
index 8fbef219..f9342f26 100644
--- a/src/ui/gui/correlation-dialog.h
+++ b/src/ui/gui/correlation-dialog.h
@@ -18,7 +18,8 @@
 #define __CORRELATION_DIALOG_H
 
 #include <gtk/gtk.h>
+#include "psppire-data-window.h"
 
-void correlation_dialog (gpointer data);
+void correlation_dialog (PsppireDataWindow * data);
 
 #endif
diff --git a/src/ui/gui/crosstabs-dialog.c b/src/ui/gui/crosstabs-dialog.c
index 45c85646..4690a0b2 100644
--- a/src/ui/gui/crosstabs-dialog.c
+++ b/src/ui/gui/crosstabs-dialog.c
@@ -383,7 +383,7 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the Crosstabs dialog box */
 void
-crosstabs_dialog (gpointer data)
+crosstabs_dialog (PsppireDataWindow *de)
 {
   gint response;
   struct crosstabs_dialog cd;
@@ -392,8 +392,6 @@ crosstabs_dialog (gpointer data)
   PsppireVarStore *vs = NULL;
   PsppireDict *dict = NULL;
 
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
-
 
   GtkWidget *dialog = get_widget_assert   (xml, "crosstabs-dialog");
   GtkWidget *source = get_widget_assert   (xml, "dict-treeview");
diff --git a/src/ui/gui/crosstabs-dialog.h b/src/ui/gui/crosstabs-dialog.h
index 34fd4e6f..dee6110b 100644
--- a/src/ui/gui/crosstabs-dialog.h
+++ b/src/ui/gui/crosstabs-dialog.h
@@ -19,8 +19,8 @@
 
 
 #include <gtk/gtk.h>
+#include "psppire-data-window.h"
 
-
-void crosstabs_dialog (gpointer data);
+void crosstabs_dialog (PsppireDataWindow * data);
 
 #endif
diff --git a/src/ui/gui/descriptives-dialog.c b/src/ui/gui/descriptives-dialog.c
index f1edf3df..fd1fe559 100644
--- a/src/ui/gui/descriptives-dialog.c
+++ b/src/ui/gui/descriptives-dialog.c
@@ -203,10 +203,9 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the Descriptives dialog box */
 void
-descriptives_dialog (gpointer data)
+descriptives_dialog (PsppireDataWindow *de)
 {
   gint response;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
   struct descriptives_dialog scd;
 
diff --git a/src/ui/gui/descriptives-dialog.h b/src/ui/gui/descriptives-dialog.h
index 84404a20..b0dc7fab 100644
--- a/src/ui/gui/descriptives-dialog.h
+++ b/src/ui/gui/descriptives-dialog.h
@@ -19,8 +19,9 @@
 
 
 #include <gtk/gtk.h>
+#include "psppire-data-window.h"
 
 
-void descriptives_dialog (gpointer data);
+void descriptives_dialog (PsppireDataWindow * data);
 
 #endif
diff --git a/src/ui/gui/examine-dialog.c b/src/ui/gui/examine-dialog.c
index ab5514cf..ac4c455c 100644
--- a/src/ui/gui/examine-dialog.c
+++ b/src/ui/gui/examine-dialog.c
@@ -234,10 +234,9 @@ run_opts_dialog (struct examine_dialog *ed)
 
 /* Pops up the Examine dialog box */
 void
-examine_dialog (gpointer data)
+examine_dialog (PsppireDataWindow *de)
 {
   gint response;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
   struct examine_dialog ex_d;
 
diff --git a/src/ui/gui/examine-dialog.h b/src/ui/gui/examine-dialog.h
index 189a4d90..707b4f0c 100644
--- a/src/ui/gui/examine-dialog.h
+++ b/src/ui/gui/examine-dialog.h
@@ -19,7 +19,8 @@
 
 
 #include <gtk/gtk.h>
+#include "psppire-data-window.h"
 
-void examine_dialog (gpointer data);
+void examine_dialog (PsppireDataWindow * data);
 
 #endif
diff --git a/src/ui/gui/factor-dialog.c b/src/ui/gui/factor-dialog.c
index 2b27bad1..90d3b39c 100644
--- a/src/ui/gui/factor-dialog.c
+++ b/src/ui/gui/factor-dialog.c
@@ -200,7 +200,7 @@ on_extract_toggle (GtkToggleButton *button, struct factor *f)
 
 /* Pops up the Factor dialog box */
 void
-factor_dialog (gpointer data)
+factor_dialog (PsppireDataWindow *dw)
 {
   struct factor fd;
   gint response;
@@ -221,7 +221,7 @@ factor_dialog (gpointer data)
 
   fd.extraction_dialog = get_widget_assert (fd.xml, "extractions-dialog");
 
-  fd.de = PSPPIRE_DATA_WINDOW (data);
+  fd.de = dw;
 
   g_signal_connect_swapped (dialog, "refresh", G_CALLBACK (refresh),  &fd);
 
diff --git a/src/ui/gui/factor-dialog.h b/src/ui/gui/factor-dialog.h
index be4e584a..b735d46a 100644
--- a/src/ui/gui/factor-dialog.h
+++ b/src/ui/gui/factor-dialog.h
@@ -19,7 +19,8 @@
 
 
 #include <gtk/gtk.h>
+#include "psppire-data-window.h"
 
-void factor_dialog (gpointer data);
+void factor_dialog (PsppireDataWindow * data);
 
 #endif
diff --git a/src/ui/gui/find-dialog.c b/src/ui/gui/find-dialog.c
index faaa8d6b..63604cf4 100644
--- a/src/ui/gui/find-dialog.c
+++ b/src/ui/gui/find-dialog.c
@@ -184,10 +184,8 @@ value_labels_toggled (GtkToggleButton *tb, gpointer data)
 /* Pops up the Find dialog box
  */
 void
-find_dialog (gpointer data)
+find_dialog (PsppireDataWindow *de)
 {
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
-
   struct find_dialog fd;
 
   GtkWidget *dialog ;
diff --git a/src/ui/gui/find-dialog.h b/src/ui/gui/find-dialog.h
index b8e1f5ac..bba986bc 100644
--- a/src/ui/gui/find-dialog.h
+++ b/src/ui/gui/find-dialog.h
@@ -19,9 +19,9 @@
 #define FIND_DIALOG_H
 
 #include <glib.h>
-#include <glib-object.h>
+#include "psppire-data-window.h"
 
 /* Pops up the Find dialog box */
-void find_dialog (gpointer data);
+void find_dialog (PsppireDataWindow *);
 
 #endif
diff --git a/src/ui/gui/frequencies-dialog.c b/src/ui/gui/frequencies-dialog.c
index cf670587..e80bc23a 100644
--- a/src/ui/gui/frequencies-dialog.c
+++ b/src/ui/gui/frequencies-dialog.c
@@ -453,10 +453,9 @@ sensitive_if_active (GtkToggleButton *toggle, GtkWidget *w)
 
 /* Pops up the Frequencies dialog box */
 void
-frequencies_dialog (gpointer data)
+frequencies_dialog (PsppireDataWindow *de)
 {
   gint response;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
   struct frequencies_dialog fd;
 
diff --git a/src/ui/gui/frequencies-dialog.h b/src/ui/gui/frequencies-dialog.h
index 46367e38..605f1de1 100644
--- a/src/ui/gui/frequencies-dialog.h
+++ b/src/ui/gui/frequencies-dialog.h
@@ -19,7 +19,8 @@
 
 
 #include <gtk/gtk.h>
+#include "psppire-data-window.h"
 
-void frequencies_dialog (gpointer data);
+void frequencies_dialog (PsppireDataWindow * data);
 
 #endif
diff --git a/src/ui/gui/goto-case-dialog.c b/src/ui/gui/goto-case-dialog.c
index 92cddb03..7c152c3b 100644
--- a/src/ui/gui/goto-case-dialog.c
+++ b/src/ui/gui/goto-case-dialog.c
@@ -40,15 +40,13 @@ refresh (const PsppireDataWindow *de, GtkBuilder *xml)
 }
 
 void
-goto_case_dialog (gpointer data)
+goto_case_dialog (PsppireDataWindow *de)
 {
   gint response;
   GtkBuilder *xml = builder_new ("psppire.ui");
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
   GtkWidget *dialog = get_widget_assert   (xml, "goto-case-dialog");
 
-
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
 
   refresh (de, xml);
diff --git a/src/ui/gui/goto-case-dialog.h b/src/ui/gui/goto-case-dialog.h
index e3f489e1..3a3cbac0 100644
--- a/src/ui/gui/goto-case-dialog.h
+++ b/src/ui/gui/goto-case-dialog.h
@@ -19,7 +19,8 @@
 
 
 #include <gtk/gtk.h>
+#include "psppire-data-window.h"
 
-void goto_case_dialog (gpointer data);
+void goto_case_dialog (PsppireDataWindow * data);
 
 #endif
diff --git a/src/ui/gui/oneway-anova-dialog.c b/src/ui/gui/oneway-anova-dialog.c
index 03c0bf3d..dde60e89 100644
--- a/src/ui/gui/oneway-anova-dialog.c
+++ b/src/ui/gui/oneway-anova-dialog.c
@@ -123,10 +123,9 @@ refresh (struct oneway_anova_dialog *ow)
 
 /* Pops up the dialog box */
 void
-oneway_anova_dialog (gpointer data)
+oneway_anova_dialog (PsppireDataWindow *de)
 {
   gint response;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
   PsppireVarStore *vs = NULL;
 
diff --git a/src/ui/gui/oneway-anova-dialog.h b/src/ui/gui/oneway-anova-dialog.h
index adc00f15..d9e29af1 100644
--- a/src/ui/gui/oneway-anova-dialog.h
+++ b/src/ui/gui/oneway-anova-dialog.h
@@ -1,7 +1,9 @@
 #ifndef ONEWAY_ANOVA_DIALOG
 #define ONEWAY_ANOVA_DIALOG
 
-void oneway_anova_dialog (gpointer data);
+#include "psppire-data-window.h"
+
+void oneway_anova_dialog (PsppireDataWindow * data);
 
 
 #endif
diff --git a/src/ui/gui/rank-dialog.c b/src/ui/gui/rank-dialog.c
index 51a98065..c7869906 100644
--- a/src/ui/gui/rank-dialog.c
+++ b/src/ui/gui/rank-dialog.c
@@ -218,10 +218,9 @@ set_sensitivity (struct rank_dialog *rd)
 
 /* Pops up the Rank dialog box */
 void
-rank_dialog (gpointer data)
+rank_dialog (PsppireDataWindow *de)
 {
   gint response;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
   struct rank_dialog rd;
 
diff --git a/src/ui/gui/rank-dialog.h b/src/ui/gui/rank-dialog.h
index b6f7038f..8c21bd07 100644
--- a/src/ui/gui/rank-dialog.h
+++ b/src/ui/gui/rank-dialog.h
@@ -18,8 +18,8 @@
 #define __RANK_DIALOG_H
 
 
-#include <gtk/gtk.h>
+#include "psppire-data-window.h"
 
-void rank_dialog (gpointer data);
+void rank_dialog (PsppireDataWindow *);
 
 #endif
diff --git a/src/ui/gui/recode-dialog.c b/src/ui/gui/recode-dialog.c
index 44b5ac8c..33fa76eb 100644
--- a/src/ui/gui/recode-dialog.c
+++ b/src/ui/gui/recode-dialog.c
@@ -455,19 +455,15 @@ static void recode_dialog (PsppireDataWindow *de, gboolean diff);
 
 /* Pops up the Recode Same version of the dialog box */
 void
-recode_same_dialog (gpointer data)
+recode_same_dialog (PsppireDataWindow *de)
 {
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
-
   recode_dialog (de, FALSE);
 }
 
 /* Pops up the Recode Different version of the dialog box */
 void
-recode_different_dialog (gpointer data)
+recode_different_dialog (PsppireDataWindow *de)
 {
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
-
   recode_dialog (de, TRUE);
 }
 
diff --git a/src/ui/gui/recode-dialog.h b/src/ui/gui/recode-dialog.h
index 018761fc..03e4a348 100644
--- a/src/ui/gui/recode-dialog.h
+++ b/src/ui/gui/recode-dialog.h
@@ -18,9 +18,9 @@
 #define __RECODE_DIALOG_H
 
 
-#include <gtk/gtk.h>
+#include "psppire-data-window.h"
 
-void recode_same_dialog (gpointer data);
-void recode_different_dialog (gpointer data);
+void recode_same_dialog (PsppireDataWindow * data);
+void recode_different_dialog (PsppireDataWindow * data);
 
 #endif
diff --git a/src/ui/gui/regression-dialog.c b/src/ui/gui/regression-dialog.c
index f4a88db7..71d1f5b1 100644
--- a/src/ui/gui/regression-dialog.c
+++ b/src/ui/gui/regression-dialog.c
@@ -222,13 +222,12 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the Regression dialog box */
 void
-regression_dialog (gpointer data)
+regression_dialog (PsppireDataWindow *de)
 {
   gint response;
   struct regression_dialog rd;
 
   GtkBuilder *xml = builder_new ("regression.ui");
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
   PsppireVarStore *vs;
 
   GtkWidget *dialog = get_widget_assert   (xml, "regression-dialog");
diff --git a/src/ui/gui/regression-dialog.h b/src/ui/gui/regression-dialog.h
index ca79d271..32067cc9 100644
--- a/src/ui/gui/regression-dialog.h
+++ b/src/ui/gui/regression-dialog.h
@@ -18,8 +18,8 @@
 #define __REGRESSION_DIALOG_H
 
 
-#include <gtk/gtk.h>
+#include "psppire-data-window.h"
 
-void regression_dialog (gpointer data);
+void regression_dialog (PsppireDataWindow * data);
 
 #endif
diff --git a/src/ui/gui/reliability-dialog.c b/src/ui/gui/reliability-dialog.c
index 13a384c3..e701956b 100644
--- a/src/ui/gui/reliability-dialog.c
+++ b/src/ui/gui/reliability-dialog.c
@@ -110,13 +110,12 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the Reliability dialog box */
 void
-reliability_dialog (gpointer data)
+reliability_dialog (PsppireDataWindow *de)
 {
   struct reliability rd;
   gint response;
 
   GtkBuilder *xml = builder_new ("reliability.ui");
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
   PsppireVarStore *vs;
 
   GtkWidget *dialog = get_widget_assert   (xml, "reliability-dialog");
diff --git a/src/ui/gui/reliability-dialog.h b/src/ui/gui/reliability-dialog.h
index c465ecf1..b79483a0 100644
--- a/src/ui/gui/reliability-dialog.h
+++ b/src/ui/gui/reliability-dialog.h
@@ -18,8 +18,8 @@
 #define __RELIABILITY_DIALOG_H
 
 
-#include <gtk/gtk.h>
+#include "psppire-data-window.h"
 
-void reliability_dialog (gpointer data);
+void reliability_dialog (PsppireDataWindow * data);
 
 #endif
diff --git a/src/ui/gui/roc-dialog.c b/src/ui/gui/roc-dialog.c
index b82d3fca..41c55712 100644
--- a/src/ui/gui/roc-dialog.c
+++ b/src/ui/gui/roc-dialog.c
@@ -119,13 +119,12 @@ on_curve_button_toggle  (GtkCheckButton *curve, struct roc *rd)
 
 /* Pops up the Roc dialog box */
 void
-roc_dialog (gpointer data)
+roc_dialog (PsppireDataWindow *de)
 {
   struct roc rd;
   gint response;
 
   GtkBuilder *xml = builder_new ("roc.ui");
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
   PsppireVarStore *vs;
 
   GtkWidget *dialog = get_widget_assert   (xml, "roc-dialog");
diff --git a/src/ui/gui/roc-dialog.h b/src/ui/gui/roc-dialog.h
index ef6db2d5..3a178c3f 100644
--- a/src/ui/gui/roc-dialog.h
+++ b/src/ui/gui/roc-dialog.h
@@ -18,8 +18,8 @@
 #define __ROC_DIALOG_H
 
 
-#include <gtk/gtk.h>
+#include "psppire-data-window.h"
 
-void roc_dialog (gpointer data);
+void roc_dialog (PsppireDataWindow * data);
 
 #endif
diff --git a/src/ui/gui/select-cases-dialog.c b/src/ui/gui/select-cases-dialog.c
index 72762ba0..b56e5f61 100644
--- a/src/ui/gui/select-cases-dialog.c
+++ b/src/ui/gui/select-cases-dialog.c
@@ -237,12 +237,11 @@ set_radiobutton (GtkWidget *button, gpointer data)
 
 /* Pops up the Select Cases dialog box */
 void
-select_cases_dialog (gpointer data)
+select_cases_dialog (PsppireDataWindow *de)
 {
   gint response;
   struct select_cases_dialog scd = {0,0,0,0,0,0};
   GtkWidget *dialog   ;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
   GtkWidget *entry = NULL;
   GtkWidget *selector ;
   GtkWidget *button_range;
diff --git a/src/ui/gui/select-cases-dialog.h b/src/ui/gui/select-cases-dialog.h
index a8d24dc8..fa21d017 100644
--- a/src/ui/gui/select-cases-dialog.h
+++ b/src/ui/gui/select-cases-dialog.h
@@ -18,9 +18,8 @@
 #define __SELECT_CASES_DIALOG_H
 
 
-#include <gtk/gtk.h>
+#include "psppire-data-window.h"
 
-
-void select_cases_dialog (gpointer data);
+void select_cases_dialog (PsppireDataWindow * data);
 
 #endif
diff --git a/src/ui/gui/sort-cases-dialog.c b/src/ui/gui/sort-cases-dialog.c
index 450c369d..92ef492d 100644
--- a/src/ui/gui/sort-cases-dialog.c
+++ b/src/ui/gui/sort-cases-dialog.c
@@ -90,10 +90,9 @@ generate_syntax (const struct sort_cases_dialog *scd)
 
 /* Pops up the Sort Cases dialog box */
 void
-sort_cases_dialog (gpointer data)
+sort_cases_dialog (PsppireDataWindow *de)
 {
   gint response;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
   struct sort_cases_dialog scd;
 
diff --git a/src/ui/gui/sort-cases-dialog.h b/src/ui/gui/sort-cases-dialog.h
index 899879ca..0c2814f1 100644
--- a/src/ui/gui/sort-cases-dialog.h
+++ b/src/ui/gui/sort-cases-dialog.h
@@ -17,9 +17,8 @@
 #ifndef __SORT_CASES_DIALOG_H
 #define __SORT_CASES_DIALOG_H
 
+#include "psppire-data-window.h"
 
-#include <gtk/gtk.h>
-
-void sort_cases_dialog (gpointer data);
+void sort_cases_dialog (PsppireDataWindow * data);
 
 #endif
diff --git a/src/ui/gui/split-file-dialog.c b/src/ui/gui/split-file-dialog.c
index 59160c7c..5acc9c50 100644
--- a/src/ui/gui/split-file-dialog.c
+++ b/src/ui/gui/split-file-dialog.c
@@ -164,10 +164,9 @@ refresh (PsppireDialog *dialog, struct split_file_dialog *d)
 
 /* Pops up the Split File dialog box */
 void
-split_file_dialog (gpointer data)
+split_file_dialog (PsppireDataWindow *de)
 {
   gint response;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
   struct split_file_dialog sfd;
   PsppireVarStore *vs ;
 
diff --git a/src/ui/gui/split-file-dialog.h b/src/ui/gui/split-file-dialog.h
index e1f0aa88..13250ad4 100644
--- a/src/ui/gui/split-file-dialog.h
+++ b/src/ui/gui/split-file-dialog.h
@@ -18,11 +18,10 @@
 #ifndef SPLIT_FILE_DIALOG_H
 #define SPLIT_FILE_DIALOG_H
 
-#include <glib.h>
-#include <glib-object.h>
+#include "psppire-data-window.h"
 
 /* Pops up the Split File dialog box */
-void split_file_dialog (gpointer data);
+void split_file_dialog (PsppireDataWindow * data);
 
 
 #endif
diff --git a/src/ui/gui/t-test-independent-samples-dialog.c b/src/ui/gui/t-test-independent-samples-dialog.c
index df09f619..dec4e769 100644
--- a/src/ui/gui/t-test-independent-samples-dialog.c
+++ b/src/ui/gui/t-test-independent-samples-dialog.c
@@ -388,11 +388,10 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the dialog box */
 void
-t_test_independent_samples_dialog (gpointer data)
+t_test_independent_samples_dialog (PsppireDataWindow *de)
 {
   struct tt_indep_samples_dialog tt_d;
   gint response;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
   PsppireVarStore *vs = NULL;
 
diff --git a/src/ui/gui/t-test-independent-samples-dialog.h b/src/ui/gui/t-test-independent-samples-dialog.h
index f8d5d079..409443c3 100644
--- a/src/ui/gui/t-test-independent-samples-dialog.h
+++ b/src/ui/gui/t-test-independent-samples-dialog.h
@@ -1,6 +1,8 @@
 #ifndef T_TEST_INDEPENDENT_SAMPLES_DIALOG
 #define T_TEST_INDEPENDENT_SAMPLES_DIALOG
 
-void t_test_independent_samples_dialog (gpointer) ;
+#include "psppire-data-window.h"
+
+void t_test_independent_samples_dialog (PsppireDataWindow *) ;
 
 #endif
diff --git a/src/ui/gui/t-test-one-sample.c b/src/ui/gui/t-test-one-sample.c
index 8e74fa53..3f13a9b7 100644
--- a/src/ui/gui/t-test-one-sample.c
+++ b/src/ui/gui/t-test-one-sample.c
@@ -120,11 +120,10 @@ dialog_state_valid (gpointer data)
 
 /* Pops up the dialog box */
 void
-t_test_one_sample_dialog (gpointer data)
+t_test_one_sample_dialog (PsppireDataWindow *de)
 {
   struct tt_one_sample_dialog tt_d;
   gint response;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
   PsppireVarStore *vs = NULL;
 
diff --git a/src/ui/gui/t-test-one-sample.h b/src/ui/gui/t-test-one-sample.h
index 7886675d..3c8e1440 100644
--- a/src/ui/gui/t-test-one-sample.h
+++ b/src/ui/gui/t-test-one-sample.h
@@ -1,6 +1,8 @@
 #ifndef T_TEST_ONE_SAMPLE_DIALOG
 #define T_TEST_ONE_SAMPLE_DIALOG
 
-void t_test_one_sample_dialog (gpointer) ;
+#include "psppire-data-window.h"
+
+void t_test_one_sample_dialog (PsppireDataWindow *) ;
 
 #endif
diff --git a/src/ui/gui/t-test-paired-samples.c b/src/ui/gui/t-test-paired-samples.c
index cf2becd7..4847cb09 100644
--- a/src/ui/gui/t-test-paired-samples.c
+++ b/src/ui/gui/t-test-paired-samples.c
@@ -156,11 +156,10 @@ select_as_pair_member (GtkTreeIter source_iter,
 
 /* Pops up the dialog box */
 void
-t_test_paired_samples_dialog (gpointer data)
+t_test_paired_samples_dialog (PsppireDataWindow *de)
 {
   struct tt_paired_samples_dialog tt_d;
   gint response;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
 
   PsppireVarStore *vs = NULL;
 
diff --git a/src/ui/gui/t-test-paired-samples.h b/src/ui/gui/t-test-paired-samples.h
index 46389e9f..d7941fc5 100644
--- a/src/ui/gui/t-test-paired-samples.h
+++ b/src/ui/gui/t-test-paired-samples.h
@@ -1,6 +1,8 @@
 #ifndef T_TEST_PAIRED_SAMPLES_DIALOG
 #define T_TEST_PAIRED_SAMPLES_DIALOG
 
-void t_test_paired_samples_dialog (gpointer) ;
+#include "psppire-data-window.h"
+
+void t_test_paired_samples_dialog (PsppireDataWindow *) ;
 
 #endif
diff --git a/src/ui/gui/transpose-dialog.c b/src/ui/gui/transpose-dialog.c
index d2082041..d366605c 100644
--- a/src/ui/gui/transpose-dialog.c
+++ b/src/ui/gui/transpose-dialog.c
@@ -77,10 +77,9 @@ dialog_state_valid (gpointer data)
 
 
 void
-transpose_dialog (gpointer data)
+transpose_dialog (PsppireDataWindow *de)
 {
   gint response ;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
   PsppireDict *dict = NULL;
 
   GtkBuilder *xml = builder_new ("psppire.ui");
diff --git a/src/ui/gui/transpose-dialog.h b/src/ui/gui/transpose-dialog.h
index cf2f4eb4..91ab97db 100644
--- a/src/ui/gui/transpose-dialog.h
+++ b/src/ui/gui/transpose-dialog.h
@@ -18,10 +18,9 @@
 #ifndef TRANSPOSE_DIALOG_H
 #define TRANSPOSE_DIALOG_H
 
-#include <glib.h>
-#include <glib-object.h>
+#include "psppire-data-window.h"
 
-void transpose_dialog (gpointer data);
+void transpose_dialog (PsppireDataWindow * data);
 
 
 #endif
diff --git a/src/ui/gui/variable-info-dialog.c b/src/ui/gui/variable-info-dialog.c
index acc9b27f..fa4343a9 100644
--- a/src/ui/gui/variable-info-dialog.c
+++ b/src/ui/gui/variable-info-dialog.c
@@ -144,10 +144,8 @@ static gchar * generate_syntax (PsppireDictView *treeview);
 
 
 void
-variable_info_dialog (gpointer data)
+variable_info_dialog (PsppireDataWindow *de)
 {
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
-
   gint response ;
 
   GtkBuilder *xml = builder_new ("variable-info.ui");
diff --git a/src/ui/gui/variable-info-dialog.h b/src/ui/gui/variable-info-dialog.h
index c959029e..c08f6c99 100644
--- a/src/ui/gui/variable-info-dialog.h
+++ b/src/ui/gui/variable-info-dialog.h
@@ -17,8 +17,8 @@
 #ifndef __VARIABLE_DIALOG_H
 #define __VARIABLE_DIALOG_H
 
-#include <gtk/gtk.h>
+#include "psppire-data-window.h"
 
-void variable_info_dialog (gpointer data);
+void variable_info_dialog (PsppireDataWindow * data);
 
 #endif
diff --git a/src/ui/gui/weight-cases-dialog.c b/src/ui/gui/weight-cases-dialog.c
index c2c58233..d09915e0 100644
--- a/src/ui/gui/weight-cases-dialog.c
+++ b/src/ui/gui/weight-cases-dialog.c
@@ -102,10 +102,9 @@ static gchar * generate_syntax (const struct weight_cases_dialog *wcd);
 
 /* Pops up the Weight Cases dialog box */
 void
-weight_cases_dialog (gpointer data)
+weight_cases_dialog (PsppireDataWindow *de)
 {
   gint response;
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
   struct weight_cases_dialog wcd;
 
   GtkBuilder *xml = builder_new ("psppire.ui");
diff --git a/src/ui/gui/weight-cases-dialog.h b/src/ui/gui/weight-cases-dialog.h
index 02173cb2..e7a3d0b9 100644
--- a/src/ui/gui/weight-cases-dialog.h
+++ b/src/ui/gui/weight-cases-dialog.h
@@ -18,11 +18,10 @@
 #ifndef WEIGHT_CASES_DIALOG_H
 #define WEIGHT_CASES_DIALOG_H
 
-#include <glib.h>
-#include <glib-object.h>
+#include "psppire-data-window.h"
 
 /* Pops up the Weight Cases dialog box */
-void weight_cases_dialog (gpointer data);
+void weight_cases_dialog (PsppireDataWindow * data);
 
 
 #endif
-- 
2.30.2