X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog.h;h=012a3e8944db19091502ba0ef58bcbe302c8f1c6;hb=339f1956cc72;hp=b3f98e6f74ac7472cd7c7fc6d81d43da91ea7890;hpb=8badabe2e12d4baac8f28e856771bac4f9342945;p=pspp
diff --git a/src/ui/gui/psppire-dialog.h b/src/ui/gui/psppire-dialog.h
index b3f98e6f74..012a3e8944 100644
--- a/src/ui/gui/psppire-dialog.h
+++ b/src/ui/gui/psppire-dialog.h
@@ -1,5 +1,5 @@
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2010, 2011 Free Software Foundation
+ Copyright (C) 2007, 2010, 2011, 2012, 2015 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
@@ -14,11 +14,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
-
#ifndef __PSPPIRE_DIALOG_H__
#define __PSPPIRE_DIALOG_H__
-
#include
#include
#include
@@ -31,11 +29,11 @@
G_BEGIN_DECLS
-#define PSPPIRE_DIALOG_TYPE (psppire_dialog_get_type ())
-#define PSPPIRE_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_DIALOG_TYPE, PsppireDialog))
-#define PSPPIRE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PSPPIRE_DIALOG_TYPE, PsppireDialogClass))
-#define PSPPIRE_IS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PSPPIRE_DIALOG_TYPE))
-#define PSPPIRE_IS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PSPPIRE_DIALOG_TYPE))
+#define PSPPIRE_TYPE_DIALOG (psppire_dialog_get_type ())
+#define PSPPIRE_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_TYPE_DIALOG, PsppireDialog))
+#define PSPPIRE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PSPPIRE_TYPE_DIALOG, PsppireDialogClass))
+#define PSPPIRE_IS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PSPPIRE_TYPE_DIALOG))
+#define PSPPIRE_IS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PSPPIRE_TYPE_DIALOG))
typedef struct _PsppireDialog PsppireDialog;
@@ -43,19 +41,9 @@ typedef struct _PsppireDialogClass PsppireDialogClass;
typedef gboolean (*ContentsAreValid) (gpointer);
-typedef enum
- {
- PSPPIRE_HORIZONTAL,
- PSPPIRE_VERTICAL,
- PSPPIRE_TABULAR
- } PsppireOrientation;
-
-
-
struct _PsppireDialog
{
PsppireWindowBase window;
- GtkWidget *box;
/* Private */
GMainLoop *loop;
@@ -63,8 +51,11 @@ struct _PsppireDialog
ContentsAreValid contents_are_valid;
gpointer validity_data;
+ ContentsAreValid contents_are_acceptable;
+ gpointer acceptable_data;
gboolean slidable;
- PsppireOrientation orientation;
+ gchar *help_page;
+
};
struct _PsppireDialogClass
@@ -81,18 +72,13 @@ void psppire_dialog_close (PsppireDialog *);
gint psppire_dialog_run (PsppireDialog *);
void psppire_dialog_set_valid_predicate (PsppireDialog *,
ContentsAreValid,
- gpointer );
+ gpointer);
+void psppire_dialog_set_accept_predicate (PsppireDialog *,
+ ContentsAreValid,
+ gpointer);
+gboolean psppire_dialog_is_acceptable (const PsppireDialog *);
void psppire_dialog_notify_change (PsppireDialog *);
-
-
-GType psppire_orientation_get_type (void);
-
-
-#define PSPPIRE_TYPE_ORIENTATION (psppire_orientation_get_type ())
-
-
G_END_DECLS
#endif /* __PSPPIRE_DIALOG_H__ */
-