diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2013-01-13 16:23:10 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2013-01-13 16:23:10 +0000 |
| commit | 4b6f0a1e8216bcc45c2cbc631e02d3b4c7650cb9 (patch) | |
| tree | cb949f128a0cf2c97dffc9646f9d072b18bb3859 /src | |
| parent | Stop using deprecated pang_ft2 functions (diff) | |
| download | inkscape-4b6f0a1e8216bcc45c2cbc631e02d3b4c7650cb9.tar.gz inkscape-4b6f0a1e8216bcc45c2cbc631e02d3b4c7650cb9.zip | |
Fix deprecated pointer grabbing in gimpcolorwheel
(bzr r12021)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/widget/gimpcolorwheel.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/ui/widget/gimpcolorwheel.c b/src/ui/widget/gimpcolorwheel.c index 4fb79edd8..f632331d8 100644 --- a/src/ui/widget/gimpcolorwheel.c +++ b/src/ui/widget/gimpcolorwheel.c @@ -686,14 +686,22 @@ set_cross_grab (GimpColorWheel *wheel, gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (wheel)), GDK_CROSSHAIR); +#if GTK_CHECK_VERSION(3,0,0) + gdk_device_grab (gtk_get_current_event_device(), + priv->window, + GDK_OWNERSHIP_NONE, + FALSE, + GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_HINT_MASK | + GDK_BUTTON_RELEASE_MASK, + cursor, time); + g_object_unref (cursor); +#else gdk_pointer_grab (priv->window, FALSE, GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_RELEASE_MASK, NULL, cursor, time); -#if GTK_CHECK_VERSION(3,0,0) - g_object_unref (cursor); -#else gdk_cursor_unref (cursor); #endif } @@ -795,8 +803,13 @@ gimp_color_wheel_button_release (GtkWidget *widget, else g_assert_not_reached (); +#if GTK_CHECK_VERSION(3,0,0) + gdk_device_ungrab (gtk_get_current_event_device(), + event->time); +#else gdk_display_pointer_ungrab (gdk_window_get_display (event->window), event->time); +#endif return TRUE; } |