diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-05-25 18:38:44 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-05-25 18:38:44 -0400 |
| commit | bd4609b14042a91646cd9057764eecfbc6faf42b (patch) | |
| tree | 8721405d2b45a998f87cccc672b4070780907fb8 /gtk/gtkspinbutton.c | |
| parent | a538f639b69a39d7bb85b39af2dfd296d28fc0aa (diff) | |
| download | gtk+-bd4609b14042a91646cd9057764eecfbc6faf42b.tar.gz | |
Merge the xi2-for-master branch
Diffstat (limited to 'gtk/gtkspinbutton.c')
| -rw-r--r-- | gtk/gtkspinbutton.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index 32934bcf89..71d7934bf0 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -903,10 +903,12 @@ gtk_spin_button_enter_notify (GtkWidget *widget, if (event->window == spin->panel) { + GdkDevice *device; gint x; gint y; - gdk_window_get_pointer (spin->panel, &x, &y, NULL); + device = gdk_event_get_device ((GdkEvent *) event); + gdk_window_get_device_position (spin->panel, device, &x, &y, NULL); if (y <= widget->requisition.height / 2) spin->in_child = GTK_ARROW_UP; @@ -915,7 +917,7 @@ gtk_spin_button_enter_notify (GtkWidget *widget, gtk_widget_queue_draw (GTK_WIDGET (spin)); } - + if (GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->enter_notify_event) return GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->enter_notify_event (widget, event); |