diff options
| author | Javier Jardón <jjardon@gnome.org> | 2010-06-02 05:13:35 +0200 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2010-07-13 19:40:46 +0200 |
| commit | 56cc11a4168d057504db9354c65eb34bebc9945a (patch) | |
| tree | 836b66fc95ce46e950aa96d7530b2381dd520555 /gtk | |
| parent | ebf6ce274a46d7c91983a176002f78f6a02ab90c (diff) | |
| download | gtk+-56cc11a4168d057504db9354c65eb34bebc9945a.tar.gz | |
gtkcombobox: unseal private pointer
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkcombobox.c | 12 | ||||
| -rw-r--r-- | gtk/gtkcombobox.h | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index d7128a764f..ca9c8f15ce 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -68,7 +68,6 @@ struct _ComboCellInfo guint pack : 1; }; -#define GTK_COMBO_BOX_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_COMBO_BOX, GtkComboBoxPrivate)) struct _GtkComboBoxPrivate { @@ -927,7 +926,12 @@ gtk_combo_box_cell_editable_init (GtkCellEditableIface *iface) static void gtk_combo_box_init (GtkComboBox *combo_box) { - GtkComboBoxPrivate *priv = GTK_COMBO_BOX_GET_PRIVATE (combo_box); + GtkComboBoxPrivate *priv; + + combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (combo_box, + GTK_TYPE_COMBO_BOX, + GtkComboBoxPrivate); + priv = combo_box->priv; priv->cell_view = gtk_cell_view_new (); gtk_widget_set_parent (priv->cell_view, GTK_WIDGET (combo_box)); @@ -952,8 +956,6 @@ gtk_combo_box_init (GtkComboBox *combo_box) priv->focus_on_click = TRUE; priv->button_sensitivity = GTK_SENSITIVITY_AUTO; - combo_box->priv = priv; - gtk_combo_box_check_appearance (combo_box); } @@ -1033,7 +1035,7 @@ gtk_combo_box_get_property (GObject *object, GParamSpec *pspec) { GtkComboBox *combo_box = GTK_COMBO_BOX (object); - GtkComboBoxPrivate *priv = GTK_COMBO_BOX_GET_PRIVATE (combo_box); + GtkComboBoxPrivate *priv = combo_box->priv; switch (prop_id) { diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h index f5141a7ded..84f54755b5 100644 --- a/gtk/gtkcombobox.h +++ b/gtk/gtkcombobox.h @@ -46,7 +46,7 @@ struct _GtkComboBox GtkBin parent_instance; /*< private >*/ - GtkComboBoxPrivate *GSEAL (priv); + GtkComboBoxPrivate *priv; }; struct _GtkComboBoxClass |