Merge commit 'origin/stable'

[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 28e7d8bda682d35d152d8a7a29881dd658cb9953..504b5c7abb04b1f64f9cbb508c937b49186a9730 100644 (file)
--- a/src/ui/gui/var-type-dialog.h
+++ b/src/ui/gui/var-type-dialog.h
@@ -1,34 +1,29 @@
-/* 
-    PSPPIRE --- A Graphical User Interface for PSPP
-    Copyright (C) 2005  Free Software Foundation
-    Written by John Darrington
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2005  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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA. */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 
 #ifndef __PSPPIRE_VAR_TYPE_DIALOG_H
 #define __PSPPIRE_VAR_TYPE_DIALOG_H
 
+#include <data/format.h>
 
 /*  This module describes the behaviour of the Variable Type dialog box,
     used for input of the variable type parameter in the var sheet */
 
-#include "format.h"
-
-enum 
+enum
   {
     BUTTON_NUMERIC,
     BUTTON_COMMA,
@@ -50,13 +45,7 @@ struct var_type_dialog
   GtkWidget *window;
 
   /* Variable to be updated */
-  struct PsppireVariable *pv;
-#if 0
-  struct variable *var;
-
-  /* Function to be run when the dialog changes a variable */
-  variable_changed_func var_change_func;
-#endif
+  struct variable *pv;
 
   /* Local copy of format specifier */
   struct fmt_spec fmt_l;
@@ -95,14 +84,13 @@ struct var_type_dialog
 };
 
 
-struct var_type_dialog * var_type_dialog_create(GladeXML *xml);
+struct var_type_dialog * var_type_dialog_create (GtkWindow *);
 
 
-void var_type_dialog_set_variable(struct var_type_dialog *dialog, 
+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);
-
+void var_type_dialog_show (struct var_type_dialog *dialog);
 
 #endif