diff options
| author | Michael Terry <mike@mterry.name> | 2011-06-01 15:24:28 -0400 |
|---|---|---|
| committer | Michael Terry <mike@mterry.name> | 2011-06-01 15:24:28 -0400 |
| commit | 5ddcf6b51cdcb8d793748ff4a812f843a0d4f6e7 (patch) | |
| tree | 67cdd3557d77ae36dbc61ed05cd6c136bf4f2fe8 /src/idoscalemenuitem.c | |
| parent | 3e67ec3d19dd4e31ec68b1b9c33f4b330c7672a3 (diff) | |
| download | ayatana-ido-5ddcf6b51cdcb8d793748ff4a812f843a0d4f6e7.tar.gz ayatana-ido-5ddcf6b51cdcb8d793748ff4a812f843a0d4f6e7.tar.bz2 ayatana-ido-5ddcf6b51cdcb8d793748ff4a812f843a0d4f6e7.zip | |
allow building either gtk2 or gtk3 versions; some deprecation cleanups
Diffstat (limited to 'src/idoscalemenuitem.c')
| -rw-r--r-- | src/idoscalemenuitem.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/idoscalemenuitem.c b/src/idoscalemenuitem.c index 5d522ca..6b1189b 100644 --- a/src/idoscalemenuitem.c +++ b/src/idoscalemenuitem.c @@ -185,8 +185,8 @@ ido_scale_menu_item_size_allocate (GtkWidget *widget, priv->right_padding = primary_padding; } - priv->child_allocation.x = GTK_CONTAINER (widget)->border_width + widget->style->xthickness; - priv->child_allocation.y = GTK_CONTAINER (widget)->border_width + widget->style->ythickness; + priv->child_allocation.x = gtk_container_get_border_width (GTK_CONTAINER (widget)) + gtk_widget_get_style (widget)->xthickness; + priv->child_allocation.y = gtk_container_get_border_width (GTK_CONTAINER (widget)) + gtk_widget_get_style (widget)->ythickness; priv->child_allocation.x += horizontal_padding; priv->child_allocation.x += priv->toggle_size; @@ -261,7 +261,6 @@ static void ido_scale_menu_item_class_init (IdoScaleMenuItemClass *item_class) { GObjectClass *gobject_class = G_OBJECT_CLASS (item_class); - GtkWidgetClass *object_class = GTK_OBJECT_CLASS (item_class); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (item_class); widget_class->button_press_event = ido_scale_menu_item_button_press_event; @@ -325,7 +324,7 @@ ido_scale_menu_item_class_init (IdoScaleMenuItemClass *item_class) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - g_type_class_add_private (object_class, sizeof (IdoScaleMenuItemPrivate)); + g_type_class_add_private (item_class, sizeof (IdoScaleMenuItemPrivate)); } static void |