Merge "master" into "psppsheet" to obtain bug fixes from "master".

[pspp] / 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 cab34096c3b812fbb748ad5da676be3bc174746f..8e11160e3e46386774c0870b17185f7d926be4eb 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, 2012  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
@@ -38,15 +38,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;
 
@@ -84,12 +82,7 @@ struct var_type_dialog
 };
 
 
-struct var_type_dialog * var_type_dialog_create (GladeXML *xml);
-
-
-void var_type_dialog_set_variable (struct var_type_dialog *dialog,
-                                 variable_changed_func set_variable_changed,
-                                 struct variable *var);
+struct var_type_dialog * var_type_dialog_create (GtkWindow *);
 
 void var_type_dialog_show (struct var_type_dialog *dialog);