Change gpointer variable to PsppireDataWindow * in dialog function signatures

diff --git a/src/ui/gui/comments-dialog.c b/src/ui/gui/comments-dialog.c
index d8714e7f0e9185de7504c74a80ce3f0d3aae1f9b..768fe476dcf21333f30c3d3c1c80e6b71bd44c89 100644 (file)
--- 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 d53283b98946bb99b31e01cd67fea127301895a6..9295d4c3a2302a9ddaa6c66a679b04f71f56b846 100644 (file)
--- 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 4e0eb3714c48fc1acf3fb366fa2398fbae781194..d70bdcce8379ddc01d8a7ba5fa192dd7f0438323 100644 (file)
--- 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 5267cdd0d297e6d37572b9c7079dfeace714003e..4594f5c2797de8f5e3dc6ac998124c71c6cda71c 100644 (file)
--- 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 82a053a3d3182db45efc9244849283e4956bfd9a..3561170d74c83d5c62454a8dd17d39513ce56d41 100644 (file)
--- 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 8fbef2195faa2f395199071852b8d7e22f6bd5e2..f9342f26ac0ec9680f19a0a5e7f1fb319429b839 100644 (file)
--- 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 45c856463d6eb029a930f22fec7b7d28ca5e10e1..4690a0b2d7a10b7a026eb8d9cec6ceef42c8919c 100644 (file)
--- 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 34fd4e6f171ade7ff240c64a25bd2f4e27f0940b..dee6110b865f302c0d57b9ebc31c93b8ec8922a1 100644 (file)
--- 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 f1edf3df95a2e180e6f666cf8872b8780e202ccf..fd1fe559a7293e5644246ab868d78b72dc661115 100644 (file)
--- 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 84404a202b34eaf147e993e9a09311b1ca041a3d..b0dc7fab2d2c143d7abb12fb0283b2e6a2e01949 100644 (file)
--- 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 ab5514cf79f36ab34548bab4ed722bbbdf10b590..ac4c455c49208fd67a9fbc69cb1c4d89ca1cca29 100644 (file)
--- 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 189a4d90990fb78a573906a0235ae9407d69e1c8..707b4f0c59160189336c6167cb544294a5b36347 100644 (file)
--- 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 2b27bad157a7aecfc0bf2fe3beb0fc70822c894d..90d3b39ce54cf38c891b17ef4d69675d80738e52 100644 (file)
--- 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 be4e584aa28e948322f2042a44e3234f9f5b92c0..b735d46a765b4b2ea9da9f983ed5764565b8b312 100644 (file)
--- 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 faaa8d6b348991a40274ed7168d154182810d8f6..63604cf496e4a0ccb71329d18376f6571c6f1760 100644 (file)
--- 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 b8e1f5acec770df1ffe092d9f48b1bb01d27e9e6..bba986bca6c11c9bbb4388255531361538303aa0 100644 (file)
--- 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 cf67058761e0488f40ea1bc2636fd7c12ea9c81d..e80bc23a8217636a4548da64e0653b6cc18fed68 100644 (file)
--- 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 46367e387fe2628239d33668e2653a07b3931f7d..605f1de13195dc8a2f6766786e62d0c09fd585ba 100644 (file)
--- 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 92cddb0366ec827b307265554b717c7044ec1f70..7c152c3b96c0cc0767dbf677c7db3dc909e10a59 100644 (file)
--- 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 e3f489e1ebfee78de4698718db61ae35c0f2e89b..3a3cbac0657863b1864b72f8306c0a505f5c79d7 100644 (file)
--- 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 03c0bf3d0ebad4b2c8a3e096eb60e62e35c3bdca..dde60e89a8f093819dcee2cdf4bab9d449033c75 100644 (file)
--- 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 adc00f15fed4ee6f17c8e90a6ca7abcd58e599c2..d9e29af19dba1b3162f09fcc6cc4f9e5980da503 100644 (file)
--- 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 51a98065f3afe32e7ab299d513b4622f09592c5f..c7869906f6eafeeb04badb9a8d6ac9e1f40392ac 100644 (file)
--- 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 b6f7038fea4a1e13d3d6a91263006ef853008256..8c21bd07b8900708ad95d0d01c91ea0478ec5fe6 100644 (file)
--- 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 44b5ac8c2ee010226d24d10d48552b500c676cf9..33fa76eb86e72d725392cb5a858d5314844f069b 100644 (file)
--- 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 018761fcb17bdfd4bc934dcc58214ae1d9ca1d4e..03e4a348e08418964d110c76958d41e5c1895d7d 100644 (file)
--- 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 f4a88db7dfca59521ce19e24dbc7f8f369861c43..71d1f5b1d5b9bba0bb1a7c79d5b731f97924d23b 100644 (file)
--- 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 ca79d271e8f93ff5f6ce15484c18f0aabff58797..32067cc9725152ccf06fb3b669b2e32fa99ca0ac 100644 (file)
--- 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 13a384c30806c42b0e05a6440dbd6992e23d9a08..e701956b60135ca56dc4404add88333ff9d9cbf2 100644 (file)
--- 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 c465ecf13b2c1be0cefe11dcaea5a58ed318172b..b79483a024995c6c5b132df57e34065e5151c211 100644 (file)
--- 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 b82d3fca955c1ce7ce39c1fa42e2cf094af7433e..41c55712d7a9c40f35c69b4ac8b24fb51ccac538 100644 (file)
--- 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 ef6db2d501fc5161698d96a41cf97a61633fe1ef..3a178c3f4af779f5adc85db868de2e72061b0925 100644 (file)
--- 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 72762ba014c840b7093ce22dcd5a0a0154bb7478..b56e5f6179de2ba693ce27230d1768418cece2f1 100644 (file)
--- 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 a8d24dc841dac9515b2f93a53272a71a39657b85..fa21d0176df87f5fd8392d0a57394e349fc9206a 100644 (file)
--- 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 450c369d77ca9c1b7639f36783ed07436339c0aa..92ef492d603cab0acf53156a5b9f793c5c84d016 100644 (file)
--- 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 899879ca1c7d5f3753836c062e7e14f33701b9a7..0c2814f1a53589c4e9492b94ef2edcd5c7e76a78 100644 (file)
--- 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 59160c7cf43aa15012f902de34d5148a46c64319..5acc9c505c7399b2b274f5d599f1eaafdfab133f 100644 (file)
--- 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 e1f0aa884b600428d883fd20e45c66457da6b4b7..13250ad4470026f5abbccc1b0e9fec5d5f5a3756 100644 (file)
--- 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 df09f61926b64b3fdf2860423a7df5ff41f259f5..dec4e7699e4c0729422facc8c33ced05f0132e22 100644 (file)
--- 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 f8d5d0794246822a48badcba90a89998689f014b..409443c34847e290a5f584517257b168db87a16d 100644 (file)
--- 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 8e74fa534975f92c9942d5aa72fe95858f12b72a..3f13a9b745c31435c55c512c3a6feda721204b52 100644 (file)
--- 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 7886675d4ac27b7df5506a9f8002632c4d0581d0..3c8e14407029ec53745b39f31211bb75758c388f 100644 (file)
--- 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 cf2becd729c518643e9ddad1d83ab8049cdbf2e1..4847cb09d2e3100d398157fde8267b8088a71f5a 100644 (file)
--- 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 46389e9f4ae7ba59e03b2e3a81ab52a4c9dc7538..d7941fc5b7d18b26b2b98ec014332ff3d430c795 100644 (file)
--- 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 d20820410a253da54c5d08e5ecef8927c2fd99e6..d366605c49853bbfd434d83d64f75051f41413f6 100644 (file)
--- 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 cf2f4eb4e7c17c8dc698bca2f4c8e224fbaeb2eb..91ab97db5d5c8750923c55f2ccb9bacaac474518 100644 (file)
--- 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 acc9b27f97e71716f4c83baa35eba06343e5d361..fa4343a931299d5396785a4858b1526e18ba7152 100644 (file)
--- 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 c959029ed6e992da23471947146a6683ee922b7d..c08f6c998c3a8b5c84bd449aa1855ffc5e930201 100644 (file)
--- 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 c2c5823319dddad9643065bcd01b8b05c796fded..d09915e07598ee17b2befb631c107e4faa8a356a 100644 (file)
--- 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 02173cb2fabe477eefdd7262889256d5602ed9f5..e7a3d0b906d5715dff2ba2f9958e762eeae5924b 100644 (file)
--- 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