Merge remote branch 'savannah/master' into sourceview

[pspp-builds.git] / src / ui / gui / var-type-dialog.h

diff --git a/src/ui/gui/var-type-dialog.h b/src/ui/gui/var-type-dialog.h
index 504b5c7abb04b1f64f9cbb508c937b49186a9730..e194771667e73fe5840d57de84f1aa5419744815 100644 (file)
--- a/src/ui/gui/var-type-dialog.h
+++ b/src/ui/gui/var-type-dialog.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2005  Free Software Foundation
+   Copyright (C) 2005, 2011  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,6 +20,8 @@
 
 #include <data/format.h>
 
+#include "psppire-var-store.h"
+
 /*  This module describes the behaviour of the Variable Type dialog box,
     used for input of the variable type parameter in the var sheet */
 
@@ -38,15 +40,13 @@ enum
 
 struct variable;
 
-typedef void (*variable_changed_func)(struct variable *var);
-
 struct var_type_dialog
 {
   GtkWidget *window;
 
   /* Variable to be updated */
   struct variable *pv;
-
+  
   /* Local copy of format specifier */
   struct fmt_spec fmt_l;
 
@@ -86,11 +86,6 @@ struct var_type_dialog
 
 struct var_type_dialog * var_type_dialog_create (GtkWindow *);
 
-
-void var_type_dialog_set_variable (struct var_type_dialog *dialog,
-                                 variable_changed_func set_variable_changed,
-                                 struct variable *var);
-
 void var_type_dialog_show (struct var_type_dialog *dialog);
 
 #endif