output view: make items selectable and use system colours

[pspp] / src / ui / gui / psppire-delimited-text.c

diff --git a/src/ui/gui/psppire-delimited-text.c b/src/ui/gui/psppire-delimited-text.c
index dd3715f6b97bb68a36bfefb855d980788daf9ed2..b232ef309226ca052846f449d92f9fcfebc9ff2d 100644 (file)
--- a/src/ui/gui/psppire-delimited-text.c
+++ b/src/ui/gui/psppire-delimited-text.c
@@ -169,10 +169,6 @@ psppire_delimited_text_get_property (GObject         *object,
     };
 }
 
-
-static void psppire_delimited_text_init            (PsppireDelimitedText      *text_file);
-static void psppire_delimited_text_class_init      (PsppireDelimitedTextClass *class);
-
 static void psppire_delimited_text_finalize        (GObject           *object);
 static void psppire_delimited_text_dispose        (GObject           *object);
 
@@ -486,44 +482,9 @@ __tree_model_init (GtkTreeModelIface *iface)
   iface->iter_parent     = __iter_parent;
 }
 
-
-GType
-psppire_delimited_text_get_type (void)
-{
-  static GType text_file_type = 0;
-
-  if (!text_file_type)
-    {
-      static const GTypeInfo text_file_info =
-       {
-         sizeof (PsppireDelimitedTextClass),
-         NULL,         /* base_init */
-         NULL,         /* base_finalize */
-         (GClassInitFunc) psppire_delimited_text_class_init,
-         NULL,         /* class_finalize */
-         NULL,         /* class_data */
-         sizeof (PsppireDelimitedText),
-         0,
-         (GInstanceInitFunc) psppire_delimited_text_init,
-       };
-
-      static const GInterfaceInfo tree_model_info = {
-       (GInterfaceInitFunc) __tree_model_init,
-       NULL,
-       NULL
-      };
-
-      text_file_type = g_type_register_static (G_TYPE_OBJECT,
-                                              "PsppireDelimitedText",
-                                              &text_file_info, 0);
-
-      g_type_add_interface_static (text_file_type, GTK_TYPE_TREE_MODEL,
-                                  &tree_model_info);
-    }
-
-  return text_file_type;
-}
-
+G_DEFINE_TYPE_WITH_CODE (PsppireDelimitedText, psppire_delimited_text, G_TYPE_OBJECT,
+                        G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
+                                               __tree_model_init))
 
 static void
 psppire_delimited_text_class_init (PsppireDelimitedTextClass *class)
@@ -531,7 +492,7 @@ psppire_delimited_text_class_init (PsppireDelimitedTextClass *class)
   GObjectClass *object_class;
 
   parent_class = g_type_class_peek_parent (class);
-  object_class = (GObjectClass*) class;
+  object_class = G_OBJECT_CLASS (class);
 
   GParamSpec *first_line_spec =
     g_param_spec_int ("first-line",