X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fvar-type-dialog.h;h=ee9b7b2ac567fb005588ad4ec8f7ea3576ef1fa5;hb=17ca35e4ca8abf4ba0c0ae82920b985fa17648cf;hp=d259fa1a71617d56105f33b3b6b5fa4a43729217;hpb=a19b858e0ac3c69e4a28c0ca6d8674427268a863;p=pspp
diff --git a/src/ui/gui/var-type-dialog.h b/src/ui/gui/var-type-dialog.h
index d259fa1a71..ee9b7b2ac5 100644
--- a/src/ui/gui/var-type-dialog.h
+++ b/src/ui/gui/var-type-dialog.h
@@ -1,34 +1,42 @@
-/*
- 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, 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
- 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 . */
-#ifndef __PSPPIRE_VAR_TYPE_DIALOG_H
-#define __PSPPIRE_VAR_TYPE_DIALOG_H
+#ifndef PSPPIRE_VAR_TYPE_DIALOG_H
+#define PSPPIRE_VAR_TYPE_DIALOG_H 1
+#include "data/format.h"
+#include "psppire-dialog.h"
+
+G_BEGIN_DECLS
+
+#define PSPPIRE_TYPE_VAR_TYPE_DIALOG (psppire_var_type_dialog_get_type())
+#define PSPPIRE_VAR_TYPE_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),PSPPIRE_TYPE_VAR_TYPE_DIALOG,PsppireVarTypeDialog))
+#define PSPPIRE_VAR_TYPE_DIALOG_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class),PSPPIRE_TYPE_VAR_TYPE_DIALOG,PsppireVarTypeDialogClass))
+#define PSPPIRE_IS_VAR_TYPE_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),PSPPIRE_TYPE_VAR_TYPE_DIALOG))
+#define PSPPIRE_IS_VAR_TYPE_DIALOG_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class),PSPPIRE_TYPE_VAR_TYPE_DIALOG))
+#define PSPPIRE_VAR_TYPE_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),PSPPIRE_TYPE_VAR_TYPE_DIALOG,PsppireVarTypeDialogClass))
+
+typedef struct _PsppireVarTypeDialog PsppireVarTypeDialog;
+typedef struct _PsppireVarTypeDialogClass PsppireVarTypeDialogClass;
/* This module describes the behaviour of the Variable Type dialog box,
used for input of the variable type parameter in the var sheet */
-#include
-
-enum
+enum
{
BUTTON_NUMERIC,
BUTTON_COMMA,
@@ -43,22 +51,13 @@ enum
struct variable;
-typedef void (*variable_changed_func)(struct variable *var);
-
-struct var_type_dialog
-{
- GtkWidget *window;
+struct _PsppireVarTypeDialog {
+ PsppireDialog parent;
- /* Variable to be updated */
- struct PsppireVariable *pv;
-#if 0
- struct variable *var;
+ /* Format being edited. */
+ struct fmt_spec base_format;
- /* Function to be run when the dialog changes a variable */
- variable_changed_func var_change_func;
-#endif
-
- /* Local copy of format specifier */
+ /* Current version of format. */
struct fmt_spec fmt_l;
/* Toggle Buttons */
@@ -67,9 +66,11 @@ struct var_type_dialog
/* Decimals */
GtkWidget *label_decimals;
GtkWidget *entry_decimals;
+ GtkAdjustment *adj_decimals;
/* Width */
GtkWidget *entry_width;
+ GtkAdjustment *adj_width;
/* Container for width/decimals entry/labels */
GtkWidget *width_decimals;
@@ -94,15 +95,16 @@ struct var_type_dialog
gint active_button;
};
+struct _PsppireVarTypeDialogClass {
+ PsppireDialogClass parent_class;
+};
-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);
+GType psppire_var_type_dialog_get_type (void) G_GNUC_CONST;
+PsppireVarTypeDialog* psppire_var_type_dialog_new (const struct fmt_spec *);
-void var_type_dialog_show(struct var_type_dialog *dialog);
+gint psppire_var_type_dialog_run (GtkWindow *parent_window,
+ struct fmt_spec *format);
+G_END_DECLS
-#endif
+#endif /* PSPPIRE_VAR_TYPE_DIALOG_H */