[gtkhtml] Drop unneeded ifdef's from 6c920a6f1207240fa5ecc2efd5396be5f93a0970 as gtkhtml required gtk+ 2.18 al

[Andre Klapper <aklapper src gnome org>]

commit 1c0ec313486a6f9e401c1dd7aee2cd66c329fbe2
Author: Andre Klapper <a9016009 gmx de>
Date:   Tue Mar 9 17:04:46 2010 +0100

    Drop unneeded ifdef's from 6c920a6f1207240fa5ecc2efd5396be5f93a0970 as gtkhtml required gtk+ 2.18 already anyway

 a11y/object.c                                |    4 ----
 components/editor/gtkhtml-color-combo.c      |    4 ----
 components/editor/gtkhtml-face-tool-button.c |    4 ----
 gtkhtml/gtkhtml-embedded.c                   |    4 ----
 gtkhtml/gtkhtml.c                            |   12 ------------
 gtkhtml/htmlembedded.c                       |    4 ----
 gtkhtml/htmlengine.c                         |   12 ------------
 7 files changed, 0 insertions(+), 44 deletions(-)
---
diff --git a/a11y/object.c b/a11y/object.c
index d312a06..0e89188 100644
--- a/a11y/object.c
+++ b/a11y/object.c
@@ -77,11 +77,7 @@ do_action (AtkAction * action, gint i)
 	return FALSE;
 	}
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_get_sensitive (widget) || !gtk_widget_get_visible (widget))
-#else
-	if (!GTK_WIDGET_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
-#endif
 		return FALSE;
 
 	switch (i) {
diff --git a/components/editor/gtkhtml-color-combo.c b/components/editor/gtkhtml-color-combo.c
index 462d5ff..51c14e6 100644
--- a/components/editor/gtkhtml-color-combo.c
+++ b/components/editor/gtkhtml-color-combo.c
@@ -162,11 +162,7 @@ color_combo_reposition_window (GtkhtmlColorCombo *combo)
 
 	gdk_window_get_origin (window, &x, &y);
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_get_has_window (GTK_WIDGET (combo))) {
-#else
-	if (GTK_WIDGET_NO_WINDOW (combo)) {
-#endif
 		x += GTK_WIDGET (combo)->allocation.x;
 		y += GTK_WIDGET (combo)->allocation.y;
 	}
diff --git a/components/editor/gtkhtml-face-tool-button.c b/components/editor/gtkhtml-face-tool-button.c
index 0dbc88e..1c1e737 100644
--- a/components/editor/gtkhtml-face-tool-button.c
+++ b/components/editor/gtkhtml-face-tool-button.c
@@ -119,11 +119,7 @@ face_tool_button_reposition_window (GtkhtmlFaceToolButton *button)
 
 	gdk_window_get_origin (window, &x, &y);
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_get_has_window (GTK_WIDGET (button))) {
-#else
-	if (GTK_WIDGET_NO_WINDOW (button)) {
-#endif
 		x += GTK_WIDGET (button)->allocation.x;
 		y += GTK_WIDGET (button)->allocation.y;
 	}
diff --git a/gtkhtml/gtkhtml-embedded.c b/gtkhtml/gtkhtml-embedded.c
index 1acede4..4ef4b4c 100644
--- a/gtkhtml/gtkhtml-embedded.c
+++ b/gtkhtml/gtkhtml-embedded.c
@@ -238,11 +238,7 @@ gtk_html_embedded_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 
 	child = gtk_bin_get_child (GTK_BIN (widget));
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (child && gtk_widget_get_visible (child)) {
-#else
-	if (child && GTK_WIDGET_VISIBLE (child)) {
-#endif
 		gtk_widget_size_allocate (child, allocation);
 	}
 	widget->allocation = *allocation;
diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
index 88a1c20..17a8692 100644
--- a/gtkhtml/gtkhtml.c
+++ b/gtkhtml/gtkhtml.c
@@ -2407,11 +2407,7 @@ focus (GtkWidget *w, GtkDirectionType direction)
 		e->shift_selection = FALSE;
 	}
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (!gtk_widget_has_focus (w) && e->caret_mode) {
-#else
-	if (!GTK_WIDGET_HAS_FOCUS (w) && e->caret_mode) {
-#endif
 		if (goto_caret_anchor (GTK_HTML (w))) {
 			gtk_widget_grab_focus (w);
 
@@ -2422,11 +2418,7 @@ focus (GtkWidget *w, GtkDirectionType direction)
 		}
 	}
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (((e->focus_object && !(gtk_widget_has_focus (w))) || html_engine_focus (e, direction)) && e->focus_object) {
-#else
-	if (((e->focus_object && !(GTK_WIDGET_HAS_FOCUS (w))) || html_engine_focus (e, direction)) && e->focus_object) {
-#endif
 		gint offset;
 		HTMLObject *obj = html_engine_get_focus_object (e, &offset);
 		gint x1, y1, x2, y2, xo, yo;
@@ -2481,11 +2473,7 @@ focus (GtkWidget *w, GtkDirectionType direction)
 		/* printf ("engine pos: %d,%d x %d,%d\n",
 		   e->x_offset, e->y_offset, e->x_offset + e->width, e->y_offset + e->height); */
 
-#if GTK_CHECK_VERSION(2,19,7)
 		if (!gtk_widget_has_focus (w) && !html_object_is_embedded (obj))
-#else
-		if (!GTK_WIDGET_HAS_FOCUS (w) && !html_object_is_embedded (obj))
-#endif
 			gtk_widget_grab_focus (w);
 		if (e->caret_mode) {
 			html_engine_jump_to_object (e, obj, offset);
diff --git a/gtkhtml/htmlembedded.c b/gtkhtml/htmlembedded.c
index 4be7903..7b618dd 100644
--- a/gtkhtml/htmlembedded.c
+++ b/gtkhtml/htmlembedded.c
@@ -149,11 +149,7 @@ calc_min_width (HTMLObject *self,
 
 	widget = HTML_EMBEDDED (self)->widget;
 
-#if GTK_CHECK_VERSION(2,19,7)
 	if (widget == NULL || !gtk_widget_get_visible (widget))
-#else
-	if (widget == NULL || !GTK_WIDGET_VISIBLE (widget))
-#endif
 		return 0;
 
 	requisition.width = requisition.height = 0;
diff --git a/gtkhtml/htmlengine.c b/gtkhtml/htmlengine.c
index 256ba8e..cebb81b 100644
--- a/gtkhtml/htmlengine.c
+++ b/gtkhtml/htmlengine.c
@@ -5042,11 +5042,7 @@ html_engine_draw_real (HTMLEngine *e, gint x, gint y, gint width, gint height, g
 
 			vscrollbar = gtk_scrolled_window_get_vscrollbar (
 				GTK_SCROLLED_WINDOW (parent));
-#if GTK_CHECK_VERSION(2,19,7)
 			if (vscrollbar != NULL && !gtk_widget_get_visible (vscrollbar)) {
-#else
-			if (vscrollbar != NULL && !GTK_WIDGET_VISIBLE (vscrollbar)) {
-#endif
 				GtkPolicyType vscrollbar_policy;
 
 				gtk_scrolled_window_get_policy (
@@ -5065,11 +5061,7 @@ html_engine_draw_real (HTMLEngine *e, gint x, gint y, gint width, gint height, g
 
 			vscrollbar = gtk_scrolled_window_get_vscrollbar (
 				GTK_SCROLLED_WINDOW (parent));
-#if GTK_CHECK_VERSION(2,19,7)
 			if (vscrollbar != NULL && gtk_widget_get_visible (vscrollbar)) {
-#else
-			if (vscrollbar != NULL && GTK_WIDGET_VISIBLE (vscrollbar)) {
-#endif
 				GtkPolicyType vscrollbar_policy;
 
 				gtk_scrolled_window_get_policy (
@@ -6646,11 +6638,7 @@ html_engine_focus (HTMLEngine *e, GtkDirectionType dir)
 				return TRUE;
 			} else if (html_object_is_embedded (cur) && !html_object_is_frame (cur)
 				   && HTML_EMBEDDED (cur)->widget) {
-#if GTK_CHECK_VERSION(2,19,7)
 				if (!gtk_widget_is_drawable (HTML_EMBEDDED (cur)->widget)) {
-#else
-				if (!GTK_WIDGET_DRAWABLE (HTML_EMBEDDED (cur)->widget)) {
-#endif
 					gint x, y;
 
 					html_object_calc_abs_position (cur, &x, &y);