Commit e0d1ddb0 authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

added run-time version check and do the workaround for bug #136636 only if

2004-03-21  Michael Natterer  <mitch@gimp.org>

	* 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
parent 7988f83e
2004-03-21 Michael Natterer <mitch@gimp.org>
* 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 <sven@gimp.org>
* plug-ins/helpbrowser/dialog.c: fixed check that suppresses
......@@ -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;
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 (gtk_check_version (2, 2, 5))
{
GdkModifierType 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;
}
#endif /* G_OS_WIN32 */
/* do not process any key events while BUTTON1 is down. We do this
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment