diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2006-05-02 23:56:43 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-05-02 23:56:43 +0000 |
| commit | f26aad1916445d25c99878138dfc384de67a2060 (patch) | |
| tree | b72263ecb326e82a49f1e8d1871ec4288b8aa299 /gtk/gtkimcontextsimple.c | |
| parent | 33cddd12d78abb2efe6facba9c859017f8df9819 (diff) | |
| download | gtk+-f26aad1916445d25c99878138dfc384de67a2060.tar.gz | |
Boilerplate reduction
Diffstat (limited to 'gtk/gtkimcontextsimple.c')
| -rw-r--r-- | gtk/gtkimcontextsimple.c | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index 08f74b4bb7..7676fe3305 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -929,8 +929,6 @@ static const guint16 gtk_compose_ignore[] = { GDK_ISO_Level3_Shift }; -static void gtk_im_context_simple_class_init (GtkIMContextSimpleClass *class); -static void gtk_im_context_simple_init (GtkIMContextSimple *im_context_simple); static void gtk_im_context_simple_finalize (GObject *obj); static gboolean gtk_im_context_simple_filter_keypress (GtkIMContext *context, GdkEventKey *key); @@ -940,35 +938,7 @@ static void gtk_im_context_simple_get_preedit_string (GtkIMContext PangoAttrList **attrs, gint *cursor_pos); -static GObjectClass *parent_class; - -GType -gtk_im_context_simple_get_type (void) -{ - static GType im_context_simple_type = 0; - - if (!im_context_simple_type) - { - static const GTypeInfo im_context_simple_info = - { - sizeof (GtkIMContextSimpleClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gtk_im_context_simple_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GtkIMContextSimple), - 0, /* n_preallocs */ - (GInstanceInitFunc) gtk_im_context_simple_init, - }; - - im_context_simple_type = - g_type_register_static (GTK_TYPE_IM_CONTEXT, I_("GtkIMContextSimple"), - &im_context_simple_info, 0); - } - - return im_context_simple_type; -} +G_DEFINE_TYPE (GtkIMContextSimple, gtk_im_context_simple, GTK_TYPE_IM_CONTEXT); static void gtk_im_context_simple_class_init (GtkIMContextSimpleClass *class) @@ -976,8 +946,6 @@ gtk_im_context_simple_class_init (GtkIMContextSimpleClass *class) GtkIMContextClass *im_context_class = GTK_IM_CONTEXT_CLASS (class); GObjectClass *gobject_class = G_OBJECT_CLASS (class); - parent_class = g_type_class_peek_parent (class); - im_context_class->filter_keypress = gtk_im_context_simple_filter_keypress; im_context_class->reset = gtk_im_context_simple_reset; im_context_class->get_preedit_string = gtk_im_context_simple_get_preedit_string; @@ -1002,7 +970,7 @@ gtk_im_context_simple_finalize (GObject *obj) context_simple->tables = NULL; } - parent_class->finalize (obj); + G_OBJECT_CLASS (gtk_im_context_simple_parent_class)->finalize (obj); } /** |