callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Depend on GTK+ >= 2.24.3, cairo >= 1.20.1, gdk-pixbuf >= 2.22.1

Browse Source 
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:
Michael Natterer
2011-04-06 19:58:24 +02:00
parent a83876040d
commit 24ee3370b8
17 changed files with 69 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libgimpwidgets/gimppropwidgets.c
View File

@ -556,17 +556,10 @@ gimp_prop_boolean_combo_box_new (GObject *config,
property_name, &value,
NULL);
#if GTK_CHECK_VERSION (2, 24, 0)
combo_box = gtk_combo_box_text_new ();
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), true_text);
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), false_text);
#else
combo_box = gtk_combo_box_new_text ();
gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), true_text);
gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), false_text);
#endif
gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), value ? 0 : 1);

10
libgimpwidgets/gimpruler.c
View File

@ -404,7 +404,6 @@ gtk_widget_get_translation_to_window (GtkWidget *widget,
widget_window = gtk_widget_get_window (widget);
#if GTK_CHECK_VERSION (2, 22, 0)
for (w = window;
w && w != widget_window;
w = gdk_window_get_effective_parent (w))
@ -416,15 +415,6 @@ gtk_widget_get_translation_to_window (GtkWidget *widget,
*x += px;
*y += py;
}
#else
for (w = window; w && w != widget_window; w = gdk_window_get_parent (w))
{
int wx, wy;
gdk_window_get_position (w, &wx, &wy);
*x += wx;
*y += wy;
}
#endif
if (w == NULL)
{