[gtkhtml] Fix build issues.

[Matthew Barnes <mbarnes src gnome org>]

commit d085cd1cb81aab0767ab8276bef27b9ffdd832ed
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Oct 25 19:06:32 2010 -0400

    Fix build issues.

 gtkhtml/gtk-compat.h  |   11 +++++------
 gtkhtml/test.c        |    2 +-
 gtkhtml/testgtkhtml.c |    2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/gtkhtml/gtk-compat.h b/gtkhtml/gtk-compat.h
index 916aa20..c12006a 100644
--- a/gtkhtml/gtk-compat.h
+++ b/gtkhtml/gtk-compat.h
@@ -5,13 +5,15 @@
 
 /* Provide a GTK+ compatibility layer. */
 
-#if !GTK_CHECK_VERSION (2,91,0)
+#if !GTK_CHECK_VERSION (2,23,1)
+#define GTK_COMBO_BOX_TEXT		GTK_COMBO_BOX
 #define gtk_combo_box_text_new		gtk_combo_box_new_text
 #define gtk_combo_box_text_append_text	gtk_combo_box_append_text
 #endif
 
-#if !GTK_CHECK_VERSION (2,23,0)
-#define gdk_window_get_visual	gdk_drawable_get_visual
+#if !GTK_CHECK_VERSION (2,23,1)
+#define gdk_window_get_display		gdk_drawable_get_display
+#define gdk_window_get_visual		gdk_drawable_get_visual
 #endif
 
 /* For use with GTK+ key binding functions. */
@@ -26,9 +28,6 @@
 #define gtk_widget_get_preferred_size(widget, minimum_size, natural_size) \
 	(gtk_widget_size_request ((widget), (minimum_size)))
 
-#define gdk_window_get_display(window) \
-	(gdk_drawable_get_display (window))
-
 #define gdk_window_set_background_pattern(window, pattern) \
 	(gdk_window_set_back_pixmap ((window), NULL, FALSE))
 
diff --git a/gtkhtml/test.c b/gtkhtml/test.c
index 66b36b5..4453e09 100644
--- a/gtkhtml/test.c
+++ b/gtkhtml/test.c
@@ -344,7 +344,7 @@ main (gint argc, gchar **argv)
 	combo_box = gtk_combo_box_text_new ();
 	for (i = 0; i < examples->len; i++) {
 		Example *example = examples->pdata[i];
-		gtk_combo_box_text_append_text (GTK_COMBO_BOX (combo_box), example->title);
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), example->title);
 	}
 	gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0);
 	g_signal_connect (combo_box, "changed", G_CALLBACK (example_changed_cb), NULL);
diff --git a/gtkhtml/testgtkhtml.c b/gtkhtml/testgtkhtml.c
index b791e78..e44fdf9 100644
--- a/gtkhtml/testgtkhtml.c
+++ b/gtkhtml/testgtkhtml.c
@@ -451,7 +451,7 @@ create_toolbars ()
 	test_combo_box = gtk_combo_box_text_new ();
 	for (i = 0; i < examples->len; i++) {
 		Example *example = examples->pdata[i];
-		gtk_combo_box_text_append_text (GTK_COMBO_BOX (test_combo_box), example->title);
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (test_combo_box), example->title);
 	}
 	gtk_combo_box_set_active (GTK_COMBO_BOX (test_combo_box), 0);
 	g_signal_connect (test_combo_box, "changed", G_CALLBACK (example_changed_cb), NULL);