X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fui%2Fgui%2Fvar-type-dialog.h;h=ee9b7b2ac567fb005588ad4ec8f7ea3576ef1fa5;hb=5b2ed095a8aaa98adaea4922855edcbfb619c728;hp=8e11160e3e46386774c0870b17185f7d926be4eb;hpb=d4ae90b2fe74d2d1427afad35d32c9e5584211ed;p=pspp
diff --git a/src/ui/gui/var-type-dialog.h b/src/ui/gui/var-type-dialog.h
index 8e11160e3e..ee9b7b2ac5 100644
--- a/src/ui/gui/var-type-dialog.h
+++ b/src/ui/gui/var-type-dialog.h
@@ -15,10 +15,23 @@
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
+#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 */
@@ -38,14 +51,13 @@ enum
struct variable;
-struct var_type_dialog
-{
- GtkWidget *window;
+struct _PsppireVarTypeDialog {
+ PsppireDialog parent;
- /* Variable to be updated */
- struct variable *pv;
-
- /* Local copy of format specifier */
+ /* Format being edited. */
+ struct fmt_spec base_format;
+
+ /* Current version of format. */
struct fmt_spec fmt_l;
/* Toggle Buttons */
@@ -54,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;
@@ -81,9 +95,16 @@ struct var_type_dialog
gint active_button;
};
+struct _PsppireVarTypeDialogClass {
+ PsppireDialogClass parent_class;
+};
+
+GType psppire_var_type_dialog_get_type (void) G_GNUC_CONST;
+PsppireVarTypeDialog* psppire_var_type_dialog_new (const struct fmt_spec *);
-struct var_type_dialog * var_type_dialog_create (GtkWindow *);
+gint psppire_var_type_dialog_run (GtkWindow *parent_window,
+ struct fmt_spec *format);
-void var_type_dialog_show (struct var_type_dialog *dialog);
+G_END_DECLS
-#endif
+#endif /* PSPPIRE_VAR_TYPE_DIALOG_H */