Set the variable display width instead of adding an override.

[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..29381261bf4c134c5b7ba062b841c1bc4f42776e 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.
-   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
@@ -43,19 +43,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 +53,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
@@ -82,16 +75,12 @@ gint           psppire_dialog_run             (PsppireDialog *);
 void           psppire_dialog_set_valid_predicate (PsppireDialog *,
                                                   ContentsAreValid,
                                                   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__ */