X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-editor.c;h=1928e10820106cef76636baa2f5767618cfd8e18;hb=refs%2Fheads%2Fctables7;hp=d1b185c681e91f57062a3b5d546439c540d33f3e;hpb=1442abd35fe6f3087bdb14fe5c65437404cc4ae8;p=pspp diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c index d1b185c681..1928e10820 100644 --- a/src/ui/gui/psppire-data-editor.c +++ b/src/ui/gui/psppire-data-editor.c @@ -46,44 +46,16 @@ #include #define _(msgid) gettext (msgid) -static void psppire_data_editor_class_init (PsppireDataEditorClass *klass); -static void psppire_data_editor_init (PsppireDataEditor *de); - static void refresh_entry (PsppireDataEditor *); -GType -psppire_data_editor_get_type (void) -{ - static GType de_type = 0; - - if (!de_type) - { - static const GTypeInfo de_info = - { - sizeof (PsppireDataEditorClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) psppire_data_editor_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (PsppireDataEditor), - 0, - (GInstanceInitFunc) psppire_data_editor_init, - }; - - de_type = g_type_register_static (GTK_TYPE_NOTEBOOK, "PsppireDataEditor", - &de_info, 0); - } - - return de_type; -} +G_DEFINE_TYPE (PsppireDataEditor, psppire_data_editor, GTK_TYPE_NOTEBOOK) static GObjectClass * parent_class = NULL; static void psppire_data_editor_finalize (GObject *obj) { - PsppireDataEditor *de = (PsppireDataEditor *) obj; + PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (obj); if (de->font) pango_font_description_free (de->font); @@ -94,7 +66,7 @@ psppire_data_editor_finalize (GObject *obj) static void psppire_data_editor_dispose (GObject *obj) { - PsppireDataEditor *de = (PsppireDataEditor *) obj; + PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (obj); if (de->dispose_has_run) return;