AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtk/gtklinkbutton.c: use accessor functions to access GtkWidget

Browse Source
This commit is contained in:
Javier Jardón 2010-08-11 23:09:12 +02:00
parent 1783b227e8
commit 00152ff835
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtklinkbutton.c
View File

@ -332,7 +332,7 @@ set_hand_cursor (GtkWidget *widget,
if (show_hand) if (show_hand)
cursor = gdk_cursor_new_for_display (display, GDK_HAND2); 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); gdk_display_flush (display);
if (cursor) if (cursor)
@ -357,6 +357,7 @@ popup_position_func (GtkMenu *menu,
{ {
GtkLinkButton *link_button = GTK_LINK_BUTTON (user_data); GtkLinkButton *link_button = GTK_LINK_BUTTON (user_data);
GtkLinkButtonPrivate *priv = link_button->priv; GtkLinkButtonPrivate *priv = link_button->priv;
GtkAllocation allocation;
GtkWidget *widget = GTK_WIDGET (link_button); GtkWidget *widget = GTK_WIDGET (link_button);
GdkScreen *screen = gtk_widget_get_screen (widget); GdkScreen *screen = gtk_widget_get_screen (widget);
GtkRequisition req; GtkRequisition req;
@ -365,12 +366,13 @@ popup_position_func (GtkMenu *menu,
g_return_if_fail (gtk_widget_get_realized (widget)); 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); gtk_widget_size_request (priv->popup_menu, &req);
*x += widget->allocation.width / 2; gtk_widget_get_allocation (widget, &allocation);
*y += widget->allocation.height; *x += allocation.width / 2;
*y += allocation.height;
monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y); monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y);
gtk_menu_set_monitor (menu, monitor_num); gtk_menu_set_monitor (menu, monitor_num);