separate sack integration test binary

[pspp] / src / ui / gui / psppire-value-entry.h

diff --git a/src/ui/gui/psppire-value-entry.h b/src/ui/gui/psppire-value-entry.h
index 42821f385fa66e282ab28d67f81248ecc00c6589..88c08a1eb09daa4c5e09d9e3afed1cf9447fb666 100644 (file)
--- a/src/ui/gui/psppire-value-entry.h
+++ b/src/ui/gui/psppire-value-entry.h
@@ -20,7 +20,7 @@
 #include <gtk/gtk.h>
 #include "data/format.h"
 
-/* PsppireValueEntry is a subclass of GtkComboBoxEntry that is specialized for
+/* PsppireValueEntry is a subclass of GtkComboBox that is specialized for
    displaying and entering "union value"s.  Its main advantage over a plain
    GtkEntry is that, when value labels are supplied, it (optionally) displays
    the value label instead of the value.  It also allows the user to choose a
@@ -50,8 +50,9 @@ struct variable;
 typedef struct _PsppireValueEntry      PsppireValueEntry;
 typedef struct _PsppireValueEntryClass PsppireValueEntryClass;
 
-struct _PsppireValueEntry {
-  GtkComboBoxEntry parent;
+struct _PsppireValueEntry
+{
+  GtkComboBox parent;
 
   gboolean show_value_label;
 
@@ -62,11 +63,12 @@ struct _PsppireValueEntry {
   const union value *cur_value;
 };
 
-struct _PsppireValueEntryClass {
-  GtkComboBoxEntryClass parent_class;
+struct _PsppireValueEntryClass
+{
+  GtkComboBoxClass parent_class;
 };
 
-GType psppire_value_entry_get_type (void) G_GNUC_CONST;
+GType psppire_value_entry_get_type (void);
 GtkWidget *psppire_value_entry_new (void);
 
 void psppire_value_entry_set_show_value_label (PsppireValueEntry *,
@@ -81,10 +83,8 @@ void psppire_value_entry_set_value_labels (PsppireValueEntry *,
 const struct val_labs *
 psppire_value_entry_get_value_labels (const PsppireValueEntry *);
 
-void psppire_value_entry_set_format (PsppireValueEntry *,
-                                     const struct fmt_spec *);
-const struct fmt_spec *
-psppire_value_entry_get_format (const PsppireValueEntry *);
+void psppire_value_entry_set_format (PsppireValueEntry *, struct fmt_spec);
+struct fmt_spec psppire_value_entry_get_format (const PsppireValueEntry *);
 
 void psppire_value_entry_set_encoding (PsppireValueEntry *, const gchar *);
 const gchar *psppire_value_entry_get_encoding (const PsppireValueEntry *);