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/gtkcombobox.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/gtkcombobox.c')
| -rw-r--r-- | gtk/gtkcombobox.c | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index baeb30de8d..96ef51a051 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -254,9 +254,7 @@ static guint combo_box_signals[LAST_SIGNAL] = {0,}; static void gtk_combo_box_cell_layout_init (GtkCellLayoutIface *iface); static void gtk_combo_box_cell_editable_init (GtkCellEditableIface *iface); -static GObject *gtk_combo_box_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_properties); +static void gtk_combo_box_constructed (GObject *object); static void gtk_combo_box_dispose (GObject *object); static void gtk_combo_box_finalize (GObject *object); static void gtk_combo_box_destroy (GtkWidget *widget); @@ -514,7 +512,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass) widget_class->direction_changed = gtk_combo_box_direction_changed; object_class = (GObjectClass *)klass; - object_class->constructor = gtk_combo_box_constructor; + object_class->constructed = gtk_combo_box_constructed; object_class->dispose = gtk_combo_box_dispose; object_class->finalize = gtk_combo_box_finalize; object_class->set_property = gtk_combo_box_set_property; @@ -4793,20 +4791,13 @@ gtk_combo_box_format_entry_text (GtkComboBox *combo_box, } -static GObject * -gtk_combo_box_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_properties) +static void +gtk_combo_box_constructed (GObject *object) { - GObject *object; - GtkComboBox *combo_box; - GtkComboBoxPrivate *priv; - - object = G_OBJECT_CLASS (gtk_combo_box_parent_class)->constructor - (type, n_construct_properties, construct_properties); + GtkComboBox *combo_box = GTK_COMBO_BOX (object); + GtkComboBoxPrivate *priv = combo_box->priv; - combo_box = GTK_COMBO_BOX (object); - priv = combo_box->priv; + G_OBJECT_CLASS (gtk_combo_box_parent_class)->constructed (object); if (!priv->area) { @@ -4844,8 +4835,6 @@ gtk_combo_box_constructor (GType type, g_signal_connect (combo_box, "changed", G_CALLBACK (gtk_combo_box_entry_active_changed), NULL); } - - return object; } |