[libgda/gtk3: 26/26] Removed GTK_CHECK_VERSION from merge with master

[Vivien Malerba <vivien src gnome org>]

commit 2ed89cb8bb9093e5da171956e729b06a6b1aff39
Author: Vivien Malerba <malerba gnome-db org>
Date:   Sun Jun 27 19:00:16 2010 +0200

    Removed GTK_CHECK_VERSION from merge with master

 libgda-ui/data-entries/gdaui-entry-shell.c |   17 -----------------
 libgda-ui/data-entries/widget-embedder.c   |    3 ---
 libgda-ui/data-entries/widget-embedder.h   |    2 --
 3 files changed, 0 insertions(+), 22 deletions(-)
---
diff --git a/libgda-ui/data-entries/gdaui-entry-shell.c b/libgda-ui/data-entries/gdaui-entry-shell.c
index e200cbc..59394d5 100644
--- a/libgda-ui/data-entries/gdaui-entry-shell.c
+++ b/libgda-ui/data-entries/gdaui-entry-shell.c
@@ -24,9 +24,7 @@
 #include <libgda/gda-data-handler.h>
 #include <libgda-ui/internal/utility.h>
 #include <glib/gi18n-lib.h>
-#if GTK_CHECK_VERSION (2,18,0)
 #include "widget-embedder.h"
-#endif
 static void gdaui_entry_shell_class_init (GdauiEntryShellClass *class);
 static void gdaui_entry_shell_init (GdauiEntryShell *wid);
 static void gdaui_entry_shell_dispose (GObject *object);
@@ -169,11 +167,7 @@ gdaui_entry_shell_init (GdauiEntryShell * shell)
 	shell->priv->hbox = hbox;
 
 	/* vbox to insert the real widget to edit data */
-#if GTK_CHECK_VERSION (2,18,0)
 	shell->priv->embedder = widget_embedder_new ();
-#else
-	shell->priv->embedder = gtk_vbox_new (FALSE, 0);
-#endif
 	gtk_box_pack_start (GTK_BOX (hbox), shell->priv->embedder, TRUE, TRUE, 0);
 	gtk_widget_show (shell->priv->embedder);	
 
@@ -306,11 +300,7 @@ gdaui_entry_shell_pack_entry (GdauiEntryShell *shell, GtkWidget *main_widget)
 {
 	g_return_if_fail (GDAUI_IS_ENTRY_SHELL (shell));
 	g_return_if_fail (main_widget && GTK_IS_WIDGET (main_widget));
-#if GTK_CHECK_VERSION (2,18,0)
 	gtk_container_add (GTK_CONTAINER (shell->priv->embedder), main_widget);
-#else
-	gtk_box_pack_start (GTK_BOX (shell->priv->embedder), main_widget, TRUE, TRUE, 0);
-#endif
 
 	/* signals */
 	g_signal_connect (G_OBJECT (shell), "contents-modified",
@@ -470,12 +460,5 @@ gdaui_entry_shell_set_unknown (GdauiEntryShell *shell, gboolean unknown)
 {
 	g_return_if_fail (GDAUI_IS_ENTRY_SHELL (shell));
 
-#if GTK_CHECK_VERSION (2,18,0)
 	widget_embedder_set_valid ((WidgetEmbedder*) shell->priv->embedder, !unknown);
-#else
-	if (unknown)
-		gtk_widget_hide (shell->priv->embedder);
-	else
-		gtk_widget_show (shell->priv->embedder);
-#endif
 }
diff --git a/libgda-ui/data-entries/widget-embedder.c b/libgda-ui/data-entries/widget-embedder.c
index 0fb2778..e209460 100644
--- a/libgda-ui/data-entries/widget-embedder.c
+++ b/libgda-ui/data-entries/widget-embedder.c
@@ -18,7 +18,6 @@
  * USA
  */
 #include "widget-embedder.h"
-#if GTK_CHECK_VERSION (2,18,0)
 static void     widget_embedder_realize       (GtkWidget       *widget);
 static void     widget_embedder_unrealize     (GtkWidget       *widget);
 static void     widget_embedder_size_request  (GtkWidget       *widget,
@@ -435,5 +434,3 @@ widget_embedder_set_valid (WidgetEmbedder *bin, gboolean valid)
 	bin->valid = valid;
 	gtk_widget_queue_draw (GTK_WIDGET (bin));
 }
-
-#endif
diff --git a/libgda-ui/data-entries/widget-embedder.h b/libgda-ui/data-entries/widget-embedder.h
index 687ce5d..25de788 100644
--- a/libgda-ui/data-entries/widget-embedder.h
+++ b/libgda-ui/data-entries/widget-embedder.h
@@ -19,7 +19,6 @@
  */
 #include <gtk/gtk.h>
 
-#if GTK_CHECK_VERSION(2,18,0)
 #define WIDGET_EMBEDDER_TYPE              (widget_embedder_get_type ())
 #define WIDGET_EMBEDDER(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), WIDGET_EMBEDDER_TYPE, WidgetEmbedder))
 #define WIDGET_EMBEDDER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), WIDGET_EMBEDDER_TYPE, WidgetEmbedderClass))
@@ -48,4 +47,3 @@ GType      widget_embedder_get_type  (void) G_GNUC_CONST;
 GtkWidget* widget_embedder_new       (void);
 void       widget_embedder_set_valid (WidgetEmbedder *bin, gboolean valid);
 
-#endif