44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
|
From 0cc1279c5033a30cb715735fab0af54813b11c45 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Bastien Nocera <hadess@hadess.net>
|
||
|
|
Date: Fri, 11 Jun 2010 14:02:49 +0100
|
||
|
|
Subject: [PATCH] Fix compilation of GTK+ theme engine for GTK+ 3.0
|
||
|
|
|
||
|
|
->draw_string() has been removed in GTK+ 3.x.
|
||
|
|
---
|
||
|
|
gtk-engine/svg-draw.c | 4 ++++
|
||
|
|
1 files changed, 4 insertions(+), 0 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/gtk-engine/svg-draw.c b/gtk-engine/svg-draw.c
|
||
|
|
index 3602a9b..8363546 100644
|
||
|
|
--- a/gtk-engine/svg-draw.c
|
||
|
|
+++ b/gtk-engine/svg-draw.c
|
||
|
|
@@ -583,6 +583,7 @@ draw_diamond (GtkStyle *style,
|
||
|
|
x, y, width, height);
|
||
|
|
}
|
||
|
|
|
||
|
|
+#if ! (GTK_CHECK_VERSION(2,90,0))
|
||
|
|
static void
|
||
|
|
draw_string (GtkStyle * style,
|
||
|
|
GdkWindow * window,
|
||
|
|
@@ -624,6 +625,7 @@ draw_string (GtkStyle * style,
|
||
|
|
gdk_gc_set_clip_rectangle(style->fg_gc[state], NULL);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
+#endif /* ! (GTK_CHECK_VERSION(2,90,0)) */
|
||
|
|
|
||
|
|
static void
|
||
|
|
draw_box (GtkStyle *style,
|
||
|
|
@@ -1024,7 +1026,9 @@ rsvg_style_class_init (RsvgStyleClass *klass)
|
||
|
|
style_class->draw_shadow = draw_shadow;
|
||
|
|
style_class->draw_arrow = draw_arrow;
|
||
|
|
style_class->draw_diamond = draw_diamond;
|
||
|
|
+#if ! (GTK_CHECK_VERSION(2,90,0))
|
||
|
|
style_class->draw_string = draw_string;
|
||
|
|
+#endif
|
||
|
|
style_class->draw_box = draw_box;
|
||
|
|
style_class->draw_flat_box = draw_flat_box;
|
||
|
|
style_class->draw_check = draw_check;
|
||
|
|
--
|
||
|
|
1.7.0.1
|
||
|
|
|