From e0d1ddb07007c652ceba51d1eec0d01843b44c71 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 21 Mar 2004 15:58:48 +0000 Subject: [PATCH] added run-time version check and do the workaround for bug #136636 only if 2004-03-21 Michael Natterer * app/display/gimpdisplayshell-callbacks.c (gimp_display_shell_events): added run-time version check and do the workaround for bug #136636 only if the Gtk+ version is < 2.2.5. * m4macros/gimp-2.0.m4: require gimp >= 2.0.0 --- ChangeLog | 9 +++++++ app/display/gimpdisplayshell-callbacks.c | 31 ++++++++++++------------ m4macros/gimp-2.0.m4 | 2 +- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 738f9302ec..d5deb705e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-03-21 Michael Natterer + + * app/display/gimpdisplayshell-callbacks.c + (gimp_display_shell_events): added run-time version + check and do the workaround for bug #136636 only if + the Gtk+ version is < 2.2.5. + + * m4macros/gimp-2.0.m4: require gimp >= 2.0.0 + 2004-03-21 Sven Neumann * plug-ins/helpbrowser/dialog.c: fixed check that suppresses diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c index 0038d269eb..37e3309d14 100644 --- a/app/display/gimpdisplayshell-callbacks.c +++ b/app/display/gimpdisplayshell-callbacks.c @@ -137,23 +137,24 @@ gimp_display_shell_events (GtkWidget *widget, /* work around missing GDK_BUTTON*_MASK bits in GdkEventKey::state * (see http://bugzilla.gnome.org/show_bug.cgi?id=136636) */ - { - GdkModifierType mouse_mask; + if (gtk_check_version (2, 2, 5)) + { + GdkModifierType mouse_mask; - gdk_device_get_state (gimp_devices_get_current (gimp), - widget->window, NULL, &mouse_mask); + gdk_device_get_state (gimp_devices_get_current (gimp), + widget->window, NULL, &mouse_mask); - if (mouse_mask & GDK_BUTTON1_MASK) - kevent->state |= GDK_BUTTON1_MASK; - if (mouse_mask & GDK_BUTTON2_MASK) - kevent->state |= GDK_BUTTON2_MASK; - if (mouse_mask & GDK_BUTTON3_MASK) - kevent->state |= GDK_BUTTON3_MASK; - if (mouse_mask & GDK_BUTTON4_MASK) - kevent->state |= GDK_BUTTON4_MASK; - if (mouse_mask & GDK_BUTTON5_MASK) - kevent->state |= GDK_BUTTON5_MASK; - } + if (mouse_mask & GDK_BUTTON1_MASK) + kevent->state |= GDK_BUTTON1_MASK; + if (mouse_mask & GDK_BUTTON2_MASK) + kevent->state |= GDK_BUTTON2_MASK; + if (mouse_mask & GDK_BUTTON3_MASK) + kevent->state |= GDK_BUTTON3_MASK; + if (mouse_mask & GDK_BUTTON4_MASK) + kevent->state |= GDK_BUTTON4_MASK; + if (mouse_mask & GDK_BUTTON5_MASK) + kevent->state |= GDK_BUTTON5_MASK; + } #endif /* G_OS_WIN32 */ /* do not process any key events while BUTTON1 is down. We do this diff --git a/m4macros/gimp-2.0.m4 b/m4macros/gimp-2.0.m4 index 6a9b3aef07..bad8c0e384 100644 --- a/m4macros/gimp-2.0.m4 +++ b/m4macros/gimp-2.0.m4 @@ -31,7 +31,7 @@ AC_ARG_ENABLE(gimptest, [ --disable-gimptest do not try to compile and run no_gimp=yes fi - min_gimp_version=ifelse([$1], ,1.3.26,$1) + min_gimp_version=ifelse([$1], ,2.0.0,$1) AC_MSG_CHECKING(for GIMP - version >= $min_gimp_version) if test x$PKG_CONFIG != xno ; then