From 00152ff835db5edada9aa95c13c0ca85c7e5795e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 11 Aug 2010 23:09:12 +0200 Subject: [PATCH] gtk/gtklinkbutton.c: use accessor functions to access GtkWidget --- gtk/gtklinkbutton.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c index 7bca09eb33..16fbdc5d3a 100644 --- a/gtk/gtklinkbutton.c +++ b/gtk/gtklinkbutton.c @@ -332,7 +332,7 @@ set_hand_cursor (GtkWidget *widget, if (show_hand) cursor = gdk_cursor_new_for_display (display, GDK_HAND2); - gdk_window_set_cursor (widget->window, cursor); + gdk_window_set_cursor (gtk_widget_get_window (widget), cursor); gdk_display_flush (display); if (cursor) @@ -357,6 +357,7 @@ popup_position_func (GtkMenu *menu, { GtkLinkButton *link_button = GTK_LINK_BUTTON (user_data); GtkLinkButtonPrivate *priv = link_button->priv; + GtkAllocation allocation; GtkWidget *widget = GTK_WIDGET (link_button); GdkScreen *screen = gtk_widget_get_screen (widget); GtkRequisition req; @@ -365,12 +366,13 @@ popup_position_func (GtkMenu *menu, g_return_if_fail (gtk_widget_get_realized (widget)); - gdk_window_get_origin (widget->window, x, y); + gdk_window_get_origin (gtk_widget_get_window (widget), x, y); gtk_widget_size_request (priv->popup_menu, &req); - *x += widget->allocation.width / 2; - *y += widget->allocation.height; + gtk_widget_get_allocation (widget, &allocation); + *x += allocation.width / 2; + *y += allocation.height; monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y); gtk_menu_set_monitor (menu, monitor_num);