[libgda/gtk3] GTK3 adaptations

[Vivien Malerba <vivien src gnome org>]

commit d1f8babae86830c265e97a85f107579f59723e0b
Author: Vivien Malerba <malerba gnome-db org>
Date:   Tue Jan 18 21:20:09 2011 +0100

    GTK3 adaptations

 tools/browser/browser-window.c                     |   40 +-------------------
 tools/browser/canvas/browser-canvas-db-relations.c |    6 +--
 tools/browser/common/ui-formgrid.c                 |    6 +--
 tools/browser/data-manager/data-widget.c           |    5 --
 4 files changed, 3 insertions(+), 54 deletions(-)
---
diff --git a/tools/browser/browser-window.c b/tools/browser/browser-window.c
index 8c6bc0c..a47842f 100644
--- a/tools/browser/browser-window.c
+++ b/tools/browser/browser-window.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 - 2010 Vivien Malerba
+ * Copyright (C) 2009 - 2011 Vivien Malerba
  *
  * This Library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public License as
@@ -102,10 +102,8 @@ struct _BrowserWindowPrivate {
 	gulong             cnc_added_sigid;
 	gulong             cnc_removed_sigid;
 
-#if GTK_CHECK_VERSION (2,18,0)
 	GtkWidget         *notif_box;
 	GSList            *notif_widgets;
-#endif
 
 	GtkWidget         *statusbar;
 	guint              cnc_statusbar_context;
@@ -227,10 +225,8 @@ browser_window_dispose (GObject *object)
 		if (bwin->priv->perspectives_nb)
 			g_object_unref (bwin->priv->perspectives_nb);
 
-#if GTK_CHECK_VERSION (2,18,0)
 		if (bwin->priv->notif_widgets)
 			g_slist_free (bwin->priv->notif_widgets);
-#endif
 		g_free (bwin->priv);
 		bwin->priv = NULL;
 	}
@@ -451,12 +447,10 @@ browser_window_new (BrowserConnection *bcnc, BrowserPerspectiveFactory *factory)
         gtk_widget_show (toolbar);
 	bwin->priv->toolbar_style = gtk_toolbar_get_style (GTK_TOOLBAR (toolbar));
 
-#if GTK_CHECK_VERSION (2,18,0)
 	bwin->priv->notif_box = gtk_vbox_new (FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), bwin->priv->notif_box, FALSE, FALSE, 0);
         gtk_widget_show (bwin->priv->notif_box);
 	bwin->priv->notif_widgets = NULL;
-#endif
 
 	GtkToolItem *ti;
 	GtkWidget *spinner, *svbox, *align;
@@ -585,16 +579,7 @@ browser_window_new (BrowserConnection *bcnc, BrowserPerspectiveFactory *factory)
 
         gtk_widget_show (GTK_WIDGET (bwin));
 
-#if GTK_CHECK_VERSION(2,18,0)
 	gtk_widget_set_can_focus ((GtkWidget* )pers->perspective_widget, TRUE);
-#else
-	GtkWidget *fwid = (GtkWidget* )pers->perspective_widget;
-	if (! GTK_WIDGET_CAN_FOCUS (fwid)) {
-		GTK_WIDGET_SET_FLAGS (fwid, GTK_CAN_FOCUS);
-		gtk_widget_queue_resize (fwid);
-		g_object_notify (G_OBJECT (fwid), "can-focus");
-	}
-#endif
 	gtk_widget_grab_focus ((GtkWidget* )pers->perspective_widget);
 
 	return bwin;
@@ -950,13 +935,8 @@ static gboolean
 fullscreen_motion_notify_cb (GtkWidget *widget, GdkEventMotion *event, G_GNUC_UNUSED gpointer user_data)
 {
 	BrowserWindow *bwin = BROWSER_WINDOW (widget);
-#if GTK_CHECK_VERSION(2,14,0)
 	if (gtk_widget_get_window (widget) != event->window)
 		return FALSE;
-#else
-	if (widget->window != event->window)
-		return FALSE;
-#endif
 
 	if (event->y < BWIN_WINDOW_FULLSCREEN_POPUP_THRESHOLD) {
 		gtk_widget_show (bwin->priv->toolbar);
@@ -1402,14 +1382,12 @@ browser_window_show_notice_printf (BrowserWindow *bwin, GtkMessageType type, con
 }
 
 
-#if GTK_CHECK_VERSION (2,18,0)
 static void
 info_bar_response_cb (GtkInfoBar *ibar, G_GNUC_UNUSED gint response, BrowserWindow *bwin)
 {
 	bwin->priv->notif_widgets = g_slist_remove (bwin->priv->notif_widgets, ibar);	
 	gtk_widget_destroy ((GtkWidget*) ibar);
 }
-#endif
 
 /* hash table to remain which context notices have to be hidden: key=context, value=GINT_TO_POINTER (1) */
 static GHashTable *hidden_contexts = NULL;
@@ -1547,7 +1525,6 @@ browser_window_show_notice (BrowserWindow *bwin, GtkMessageType type, const gcha
 					       (GClosureNotify) g_free, 0);
 		}
 
-#if GTK_CHECK_VERSION (2,18,0)
 		/* use a GtkInfoBar */
 		GtkWidget *ibar, *content_area, *label;
 		
@@ -1580,21 +1557,6 @@ browser_window_show_notice (BrowserWindow *bwin, GtkMessageType type, const gcha
 									 bwin->priv->notif_widgets);
 		}
 		gtk_widget_show (ibar);
-#else
-		/* create the error message dialog */
-		GtkWidget *dialog;
-		dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (bwin),
-							     GTK_DIALOG_DESTROY_WITH_PARENT |
-							     GTK_DIALOG_MODAL, GTK_MESSAGE_INFO,
-							     GTK_BUTTONS_CLOSE,
-							     "<span weight=\"bold\">%s</span>\n%s", _("Note:"), text);
-		if (cb)
-			gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), cb, FALSE, FALSE, 10);
-	
-		gtk_widget_show_all (dialog);
-		gtk_dialog_run (GTK_DIALOG (dialog));
-		gtk_widget_destroy (dialog);
-#endif
 	}
 }
 
diff --git a/tools/browser/canvas/browser-canvas-db-relations.c b/tools/browser/canvas/browser-canvas-db-relations.c
index 8609183..574893f 100644
--- a/tools/browser/canvas/browser-canvas-db-relations.c
+++ b/tools/browser/canvas/browser-canvas-db-relations.c
@@ -1,6 +1,6 @@
 /* browser-canvas-db-relations.c
  *
- * Copyright (C) 2002 - 2010 Vivien Malerba
+ * Copyright (C) 2002 - 2011 Vivien Malerba
  * Copyright (C) 2002 Fernando Martins
  *
  * This program is free software; you can redistribute it and/or
@@ -612,11 +612,7 @@ popup_add_table_cb (G_GNUC_UNUSED GtkMenuItem *mitem, BrowserCanvasDbRelations *
 		g_object_set_data (G_OBJECT (dbrels->priv->add_dialog), "__canvas", dbrels);
 
 		vbox = gtk_vbox_new (FALSE, 0);
-#if GTK_CHECK_VERSION(2,18,0)
 		dcontents = gtk_dialog_get_content_area (GTK_DIALOG (dbrels->priv->add_dialog));
-#else
-		dcontents = GTK_DIALOG (dbrels->priv->add_dialog)->vbox;
-#endif
 		gtk_container_add (GTK_CONTAINER (dcontents), vbox);
 		
 		cloud = objects_cloud_new (dbrels->priv->mstruct, OBJECTS_CLOUD_TYPE_TABLE);
diff --git a/tools/browser/common/ui-formgrid.c b/tools/browser/common/ui-formgrid.c
index 378a7fa..954da0f 100644
--- a/tools/browser/common/ui-formgrid.c
+++ b/tools/browser/common/ui-formgrid.c
@@ -330,13 +330,9 @@ statement_executed_cb (G_GNUC_UNUSED BrowserConnection *bcnc,
 		toplevel = gtk_widget_get_toplevel (GTK_WIDGET (formgrid));
 		dialog = gtk_dialog_new_with_buttons (_("Action executed"),
 						      GTK_WINDOW (toplevel),
-						      GTK_DIALOG_NO_SEPARATOR,
+						      0,
 						      GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
-#if GTK_CHECK_VERSION(2,18,0)
 		dcontents = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#else
-		dcontents = GTK_DIALOG (dialog)->vbox;
-#endif
 		gtk_box_set_spacing (GTK_BOX (dcontents), 5);
 		gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE, TRUE);
 		
diff --git a/tools/browser/data-manager/data-widget.c b/tools/browser/data-manager/data-widget.c
index cf3ca86..10ee44e 100644
--- a/tools/browser/data-manager/data-widget.c
+++ b/tools/browser/data-manager/data-widget.c
@@ -109,7 +109,6 @@ data_widget_init (DataWidget *dwid, G_GNUC_UNUSED DataWidgetClass *klass)
 	gtk_box_pack_start (GTK_BOX (dwid), dwid->priv->top_nb, TRUE, TRUE, 0);
 
 	/* error page */
-#if GTK_CHECK_VERSION (2,18,0)
 	GtkWidget *info;
 	info = gtk_info_bar_new ();
 	gtk_notebook_append_page (GTK_NOTEBOOK (dwid->priv->top_nb), info, NULL);
@@ -118,10 +117,6 @@ data_widget_init (DataWidget *dwid, G_GNUC_UNUSED DataWidgetClass *klass)
 	gtk_label_set_ellipsize (GTK_LABEL (dwid->priv->info_label), PANGO_ELLIPSIZE_END);
 	gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (info))),
 			   dwid->priv->info_label);
-#else
-	dwid->priv->info_label = gtk_label_new ("");
-	gtk_notebook_append_page (GTK_NOTEBOOK (dwid->priv->top_nb), dwid->priv->info_label, NULL);
-#endif
 
 	/* contents page */
 	GtkWidget *vbox;