Remove unused "finalize" functions.

[pspp] / src / ui / gui / psppire-dialog.c

diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c
index c365ab4b8eb47b2d237c9875db4eb92f2664435a..9c854a699e66f153ef878cc8faa4867d780b3b33 100644 (file)
--- a/src/ui/gui/psppire-dialog.c
+++ b/src/ui/gui/psppire-dialog.c
@@ -21,11 +21,12 @@
 #include "psppire-dialog.h"
 #include "psppire-buttonbox.h"
 #include "psppire-selector.h"
-#include "psppire-conf.h"
 #include <string.h>
 #include "builder-wrapper.h"
 #include "help-menu.h"
 
+#include "psppire-window-base.h"
+
 static void psppire_dialog_class_init          (PsppireDialogClass *);
 static void psppire_dialog_init                (PsppireDialog      *);
 
@@ -69,7 +70,7 @@ psppire_dialog_get_type (void)
        NULL
       };
 
-      dialog_type = g_type_register_static (GTK_TYPE_WINDOW,
+      dialog_type = g_type_register_static (PSPPIRE_TYPE_WINDOW_BASE,
                                            "PsppireDialog", &dialog_info, 0);
 
       g_type_add_interface_static (dialog_type,
@@ -85,22 +86,6 @@ psppire_dialog_get_type (void)
 static GObjectClass     *parent_class = NULL;
 
 
-static void
-psppire_dialog_finalize (GObject *object)
-{
-  PsppireDialog *dialog ;
-
-  g_return_if_fail (object != NULL);
-  g_return_if_fail (PSPPIRE_IS_DIALOG (object));
-
-  dialog = PSPPIRE_DIALOG (object);
-
-  if (G_OBJECT_CLASS (parent_class)->finalize)
-    G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-
-
 /* Properties */
 enum
 {
@@ -285,7 +270,7 @@ psppire_dialog_class_init (PsppireDialogClass *class)
                  G_TYPE_STRING);
 
 
-  object_class->finalize = psppire_dialog_finalize;
+  parent_class = g_type_class_peek_parent (class);
 }
 
 
@@ -314,37 +299,6 @@ delete_event_callback (GtkWidget *w, GdkEvent *e, gpointer data)
 }
 
 
-static gboolean
-configure_event_callback (GtkDialog *dialog,
-                         GdkEvent *event, gpointer data)
-{
-  const gchar *base;
-
-  PsppireConf *conf = psppire_conf_new ();
-
-  if ( ! gtk_widget_get_mapped (GTK_WIDGET (dialog)))
-    return FALSE;
-
-  base = gtk_buildable_get_name (GTK_BUILDABLE (dialog));
-
-  psppire_conf_save_window_geometry (conf, base, GTK_WINDOW (dialog));
-
-  return FALSE;
-}
-
-
-static void
-on_realize (GtkWindow *dialog, gpointer data)
-{
-  PsppireConf *conf = psppire_conf_new ();
-
-  const gchar *base = gtk_buildable_get_name (GTK_BUILDABLE (dialog));
-
-  psppire_conf_set_window_geometry (conf, base, dialog);
-}
-
-
-
 static void
 psppire_dialog_init (PsppireDialog *dialog)
 {
@@ -352,6 +306,8 @@ psppire_dialog_init (PsppireDialog *dialog)
   dialog->box = NULL;
   dialog->contents_are_valid = NULL;
   dialog->validity_data = NULL;
+  dialog->contents_are_acceptable = NULL;
+  dialog->acceptable_data = NULL;
   dialog->slidable = FALSE;
 
   g_value_init (&value, orientation_spec->value_type);
@@ -366,15 +322,6 @@ psppire_dialog_init (PsppireDialog *dialog)
                    G_CALLBACK (delete_event_callback),
                    dialog);
 
-  g_signal_connect (dialog, "configure-event",
-                   G_CALLBACK (configure_event_callback),
-                   dialog);
-
-  g_signal_connect (dialog, "realize",
-                   G_CALLBACK (on_realize),
-                   dialog);
-
-
   gtk_window_set_type_hint (GTK_WINDOW (dialog),
        GDK_WINDOW_TYPE_HINT_DIALOG);
 
@@ -584,6 +531,10 @@ psppire_orientation_get_type (void)
 }
 
 
+/* Sets a predicate function that is checked after each change that the user
+   makes to the dialog's state.  If the predicate function returns false, then
+   "OK" and other buttons that accept the dialog's settings will be
+   disabled. */
 void
 psppire_dialog_set_valid_predicate (PsppireDialog *dialog,
                                    ContentsAreValid contents_are_valid,
@@ -593,6 +544,30 @@ psppire_dialog_set_valid_predicate (PsppireDialog *dialog,
   dialog->validity_data = data;
 }
 
+/* Sets a predicate function that is called after "OK" or another button that
+   accepts the dialog's settings is pushed.  If the predicate function returns
+   false, then the button push is ignored.  (If the predicate function returns
+   false, then it should take some action to notify the user why the contents
+   are unacceptable, e.g. pop up a dialog box.)
+
+   An accept predicate is preferred over a validity predicate when the reason
+   why the dialog settings are unacceptable may not be obvious to the user, so
+   that the user needs a helpful message to explain. */
+void
+psppire_dialog_set_accept_predicate (PsppireDialog *dialog,
+                                     ContentsAreValid contents_are_acceptable,
+                                     gpointer data)
+{
+  dialog->contents_are_acceptable = contents_are_acceptable;
+  dialog->acceptable_data = data;
+}
+
+gboolean
+psppire_dialog_is_acceptable (const PsppireDialog *dialog)
+{
+  return (dialog->contents_are_acceptable == NULL
+          || dialog->contents_are_acceptable (dialog->acceptable_data));
+}