[gnumeric] wbcg: switch to GtkGrid.

[Morten Welinder <mortenw src gnome org>]

commit b1270f344daf03bbba6f7038dc54914999a04849
Author: Morten Welinder <terra gnome org>
Date:   Tue Jan 10 19:52:27 2012 -0500

    wbcg: switch to GtkGrid.

 ChangeLog     |    2 ++
 src/wbc-gtk.c |   19 ++++++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ad21a9a..f9013cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-01-10  Morten Welinder  <terra gnome org>
 
+	* src/wbc-gtk.c (wbc_gtk_init): Switch from GtkTable to GtkGrid.
+
 	* src/gui-util.c (gnm_store_text_tag_attr_in_pango): Use
 	gnm_object_get_bool.
 
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 6139329..20fb651 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -960,6 +960,8 @@ static void
 wbc_gtk_create_notebook_area (WBCGtk *wbcg)
 {
 	wbcg->notebook_area = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	gtk_widget_set_hexpand (wbcg->notebook_area, TRUE);
+	gtk_widget_set_vexpand (wbcg->notebook_area, TRUE);
 
 	wbcg->snotebook = g_object_new (GTK_TYPE_NOTEBOOK,
 					"show-tabs", FALSE,
@@ -986,13 +988,9 @@ wbc_gtk_create_notebook_area (WBCGtk *wbcg)
 
 	gtk_widget_show_all (GTK_WIDGET (wbcg->tabs_paned));
 	gtk_widget_show (GTK_WIDGET (wbcg->notebook_area));
-	gtk_table_attach (GTK_TABLE (wbcg->table),
-			  wbcg->notebook_area,
-			  0, 1, 1, 2,
-			  GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-			  GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-			  0, 0);
-
+	gtk_grid_attach (GTK_GRID (wbcg->table),
+			 wbcg->notebook_area,
+			 0, 1, 1, 1);
 }
 
 
@@ -2750,9 +2748,8 @@ wbc_gtk_create_edit_area (WBCGtk *wbcg)
 			   GTK_WIDGET (wbcg->edit_line.entry));
 	gtk_toolbar_insert (tb, item, -1);
 
-	gtk_table_attach (GTK_TABLE (wbcg->table), GTK_WIDGET (tb),
-			  0, 1, 0, 1,
-			  GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 0, 0);
+	gtk_grid_attach (GTK_GRID (wbcg->table), GTK_WIDGET (tb),
+			 0, 0, 1, 1);
 
 	/* Do signal setup for the editing input line */
 	g_signal_connect (G_OBJECT (entry),
@@ -5708,7 +5705,7 @@ wbc_gtk_init (GObject *obj)
 	char		*uifile;
 	unsigned	 i;
 
-	wbcg->table       = gtk_table_new (0, 0, 0);
+	wbcg->table       = gtk_grid_new ();
 	wbcg->bnotebook   = NULL;
 	wbcg->snotebook   = NULL;
 	wbcg->notebook_area = NULL;