projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefiles: Use $(PHONY) instead of .PHONY.
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog.h
diff --git
a/src/ui/gui/psppire-dialog.h
b/src/ui/gui/psppire-dialog.h
index 3b01557ec7ebe05303185cbd3b4ee9f04e291f1e..012a3e8944db19091502ba0ef58bcbe302c8f1c6 100644
(file)
--- 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.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2010, 2011, 2012 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
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 <http://www.gnu.org/licenses/>. */
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_DIALOG_H__
#define __PSPPIRE_DIALOG_H__
#ifndef __PSPPIRE_DIALOG_H__
#define __PSPPIRE_DIALOG_H__
-
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
@@
-43,19
+41,9
@@
typedef struct _PsppireDialogClass PsppireDialogClass;
typedef gboolean (*ContentsAreValid) (gpointer);
typedef gboolean (*ContentsAreValid) (gpointer);
-typedef enum
- {
- PSPPIRE_HORIZONTAL,
- PSPPIRE_VERTICAL,
- PSPPIRE_TABULAR
- } PsppireOrientation;
-
-
-
struct _PsppireDialog
{
PsppireWindowBase window;
struct _PsppireDialog
{
PsppireWindowBase window;
- GtkWidget *box;
/* Private */
GMainLoop *loop;
/* Private */
GMainLoop *loop;
@@
-63,8
+51,11
@@
struct _PsppireDialog
ContentsAreValid contents_are_valid;
gpointer validity_data;
ContentsAreValid contents_are_valid;
gpointer validity_data;
+ ContentsAreValid contents_are_acceptable;
+ gpointer acceptable_data;
gboolean slidable;
gboolean slidable;
- PsppireOrientation orientation;
+ gchar *help_page;
+
};
struct _PsppireDialogClass
};
struct _PsppireDialogClass
@@
-81,18
+72,13
@@
void psppire_dialog_close (PsppireDialog *);
gint psppire_dialog_run (PsppireDialog *);
void psppire_dialog_set_valid_predicate (PsppireDialog *,
ContentsAreValid,
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 *);
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__ */
G_END_DECLS
#endif /* __PSPPIRE_DIALOG_H__ */
-