Depend on GTK+ >= 2.24.3, cairo >= 1.20.1, gdk-pixbuf >= 2.22.1
and completely separate configure and sanity checks for gdk-pixbuf from GTK+, because it's now distributed as a separate package. Remove all sorts of conditional compiling based on GDK_CHECK_VERSION() and CAIRO_VERSION.
This commit is contained in:
@ -149,8 +149,6 @@ gimp_ui_init (const gchar *prog_name,
|
||||
static GdkWindow *
|
||||
gimp_ui_get_foreign_window (guint32 window)
|
||||
{
|
||||
#if GTK_CHECK_VERSION (2, 24, 0)
|
||||
|
||||
#ifdef GDK_WINDOWING_X11
|
||||
return gdk_x11_window_foreign_new_for_display (gdk_display_get_default (),
|
||||
window);
|
||||
@ -161,15 +159,6 @@ gimp_ui_get_foreign_window (guint32 window)
|
||||
window);
|
||||
#endif
|
||||
|
||||
#else /* ! GTK_CHECK_VERSION (2, 24, 0) */
|
||||
|
||||
#ifndef GDK_NATIVE_WINDOW_POINTER
|
||||
return gdk_window_foreign_new_for_display (gdk_display_get_default (),
|
||||
window);
|
||||
#endif
|
||||
|
||||
#endif /* GTK_CHECK_VERSION (2, 24, 0) */
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user