diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-06-26 18:22:42 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-06-26 19:06:43 -0400 |
| commit | 9c37b3de7466a22d4c784657a86c522e2a4f118a (patch) | |
| tree | 8efe1f75cef57d9af8484324dca0c35714a1ca16 /gtk/gtkcomboboxtext.c | |
| parent | 66492678b5a3043f4acd77a6a41405bc4f8097b3 (diff) | |
| download | gtk+-9c37b3de7466a22d4c784657a86c522e2a4f118a.tar.gz | |
gtk: Don't use GObjectClass.constructor
Use the newer constructed instead, which has a fast path in GObject.
Diffstat (limited to 'gtk/gtkcomboboxtext.c')
| -rw-r--r-- | gtk/gtkcomboboxtext.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c index 9ac057d5e8..863435ea99 100644 --- a/gtk/gtkcomboboxtext.c +++ b/gtk/gtkcomboboxtext.c @@ -92,16 +92,12 @@ G_DEFINE_TYPE_WITH_CODE (GtkComboBoxText, gtk_combo_box_text, GTK_TYPE_COMBO_BOX G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, gtk_combo_box_text_buildable_interface_init)); -static GObject * -gtk_combo_box_text_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_properties) +static void +gtk_combo_box_text_constructed (GObject *object) { - GObject *object; const gint text_column = 0; - object = G_OBJECT_CLASS (gtk_combo_box_text_parent_class)->constructor - (type, n_construct_properties, construct_properties); + G_OBJECT_CLASS (gtk_combo_box_text_parent_class)->constructed (object); gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (object), text_column); gtk_combo_box_set_id_column (GTK_COMBO_BOX (object), 1); @@ -116,8 +112,6 @@ gtk_combo_box_text_constructor (GType type, "text", text_column, NULL); } - - return object; } static void @@ -136,7 +130,7 @@ gtk_combo_box_text_class_init (GtkComboBoxTextClass *klass) GObjectClass *object_class; object_class = (GObjectClass *)klass; - object_class->constructor = gtk_combo_box_text_constructor; + object_class->constructed = gtk_combo_box_text_constructed; } static void |