[gucharmap] Keep with the modern Gtk widgetry times

[Ryan Lortie <ryanl src gnome org>]

commit a3112d70de32a5ceec9cd672771373df6e7de8e2
Author: Ryan Lortie <desrt desrt ca>
Date:   Fri Jan 27 10:38:55 2012 -0500

    Keep with the modern Gtk widgetry times
    
    Stop using boxes.  GtkGrid is the new black.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=668852

 gucharmap/gucharmap-charmap.c       |    3 ++
 gucharmap/gucharmap-search-dialog.c |   16 +++++++-----
 gucharmap/gucharmap-window.c        |   45 +++++++++++-----------------------
 3 files changed, 27 insertions(+), 37 deletions(-)
---
diff --git a/gucharmap/gucharmap-charmap.c b/gucharmap/gucharmap-charmap.c
index ea088c7..d409c27 100644
--- a/gucharmap/gucharmap-charmap.c
+++ b/gucharmap/gucharmap-charmap.c
@@ -1180,6 +1180,9 @@ gucharmap_charmap_init (GucharmapCharmap *charmap)
 
   gtk_paned_pack2 (GTK_PANED (charmap), priv->notebook, TRUE, FALSE);
   gtk_widget_show (priv->notebook);
+
+  gtk_widget_set_hexpand (GTK_WIDGET (charmap), TRUE);
+  gtk_widget_set_vexpand (GTK_WIDGET (charmap), TRUE);
 }
 
 GtkWidget *
diff --git a/gucharmap/gucharmap-search-dialog.c b/gucharmap/gucharmap-search-dialog.c
index 59044ab..685e994 100644
--- a/gucharmap/gucharmap-search-dialog.c
+++ b/gucharmap/gucharmap-search-dialog.c
@@ -724,7 +724,7 @@ static void
 gucharmap_search_dialog_init (GucharmapSearchDialog *search_dialog)
 {
   GucharmapSearchDialogPrivate *priv = GUCHARMAP_SEARCH_DIALOG_GET_PRIVATE (search_dialog);
-  GtkWidget *hbox, *label, *content_area;
+  GtkWidget *grid, *label, *content_area;
 
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (search_dialog));
 
@@ -759,19 +759,21 @@ gucharmap_search_dialog_init (GucharmapSearchDialog *search_dialog)
                                            GTK_RESPONSE_CLOSE,
                                            -1);
 
-  hbox = gtk_hbox_new (FALSE, 12);
-  gtk_widget_show (hbox);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
-  gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
+  grid = gtk_grid_new ();
+  gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
+  gtk_widget_show (grid);
+  gtk_container_set_border_width (GTK_CONTAINER (grid), 6);
+  gtk_box_pack_start (GTK_BOX (content_area), grid, FALSE, FALSE, 0);
 
   label = gtk_label_new_with_mnemonic (_("_Search:"));
   gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
 
   priv->entry = gtk_entry_new ();
   gtk_widget_show (priv->entry);
+  gtk_widget_set_hexpand (priv->entry, TRUE);
   gtk_entry_set_activates_default (GTK_ENTRY (priv->entry), TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox), priv->entry, TRUE, TRUE, 0);
+  gtk_grid_attach (GTK_GRID (grid), priv->entry, 1, 0, 1, 1);
   g_signal_connect (priv->entry, "changed", G_CALLBACK (entry_changed), search_dialog);
 
   priv->whole_word_option = gtk_check_button_new_with_mnemonic (_("Match _whole word"));
diff --git a/gucharmap/gucharmap-window.c b/gucharmap/gucharmap-window.c
index 218c1a8..6cc6efb 100644
--- a/gucharmap/gucharmap-window.c
+++ b/gucharmap/gucharmap-window.c
@@ -743,7 +743,7 @@ charmap_sync_active_character (GtkWidget *widget,
 static void
 gucharmap_window_init (GucharmapWindow *guw)
 {
-  GtkWidget *big_vbox, *hbox, *bbox, *button, *label;
+  GtkWidget *grid, *button, *label;
   GucharmapChartable *chartable;
   /* tooltips are NULL because they are never actually shown in the program */
   const GtkActionEntry menu_entries[] =
@@ -855,16 +855,16 @@ gucharmap_window_init (GucharmapWindow *guw)
   gtk_ui_manager_add_ui_from_string (guw->uimanager, ui_info, strlen (ui_info), NULL);
   
   /* Now the widgets */
-  big_vbox = gtk_vbox_new (FALSE, 0);
-  gtk_container_add (GTK_CONTAINER (guw), big_vbox);
+  grid = gtk_grid_new ();
+  gtk_container_add (GTK_CONTAINER (guw), grid);
 
   /* First the menubar */
   menubar = gtk_ui_manager_get_widget (guw->uimanager, "/MenuBar");
-  gtk_box_pack_start (GTK_BOX (big_vbox), menubar, FALSE, FALSE, 0);
+  gtk_grid_attach (GTK_GRID (grid), menubar, 0, 0, 3, 1);
 
   /* The font selector */
   guw->fontsel = gucharmap_mini_font_selection_new ();
-  gtk_box_pack_start (GTK_BOX (big_vbox), guw->fontsel, FALSE, FALSE, 0);
+  gtk_grid_attach (GTK_GRID (grid), guw->fontsel, 0, 1, 3, 1);
   gtk_widget_show (GTK_WIDGET (guw->fontsel));
 
   /* The charmap */
@@ -872,62 +872,47 @@ gucharmap_window_init (GucharmapWindow *guw)
   g_signal_connect (guw->charmap, "notify::font-desc",
                     G_CALLBACK (charmap_sync_font_desc), guw);
 
-  gtk_box_pack_start (GTK_BOX (big_vbox), GTK_WIDGET (guw->charmap),
-                      TRUE, TRUE, 0);
+  gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (guw->charmap), 0, 2, 3, 1);
   gtk_widget_show (GTK_WIDGET (guw->charmap));
 
   /* Text to copy entry + button */
-  hbox = gtk_hbox_new (FALSE, 6);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
-
   label = gtk_label_new_with_mnemonic (_("_Text to copy:"));
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  g_object_set (label, "margin", 6, NULL);
+  gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1);
   gtk_widget_show (label);
 
-  bbox = gtk_hbutton_box_new ();
-
   button = gtk_button_new_from_stock (GTK_STOCK_COPY);
+  g_object_set (button, "margin", 6, NULL);
   gtk_widget_set_tooltip_text (button, _("Copy to the clipboard."));
   g_signal_connect (G_OBJECT (button), "clicked",
                     G_CALLBACK (edit_copy), guw);
-  gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
+  gtk_grid_attach (GTK_GRID (grid), button, 2, 3, 1, 1);
   gtk_widget_show (button);
 
   gtk_widget_set_sensitive (button, FALSE);
   guw->text_to_copy_entry = gtk_entry_new ();
+  g_object_set (guw->text_to_copy_entry, "margin", 6, NULL);
+  gtk_widget_set_hexpand (guw->text_to_copy_entry, TRUE);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), guw->text_to_copy_entry);
   g_signal_connect (G_OBJECT (guw->text_to_copy_entry), "changed",
                     G_CALLBACK (entry_changed_sensitize_button), button);
 
-  gtk_box_pack_start (GTK_BOX (hbox), guw->text_to_copy_entry, TRUE, TRUE, 0);
+  gtk_grid_attach (GTK_GRID (grid), guw->text_to_copy_entry, 1, 3, 1, 1);
   gtk_widget_show (guw->text_to_copy_entry);
 
-  gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0);
-  gtk_widget_show (bbox);
-
-  gtk_box_pack_start (GTK_BOX (big_vbox), hbox, FALSE, FALSE, 0);
-  gtk_widget_show (hbox);
-
   /* FIXMEchpe!! */
   chartable = gucharmap_charmap_get_chartable (guw->charmap);
   g_signal_connect (chartable, "activate", G_CALLBACK (insert_character_in_text_to_copy), guw);
 
   /* Finally the statusbar */
   guw->status = gtk_statusbar_new ();
-  gtk_box_pack_start (GTK_BOX (big_vbox), guw->status, FALSE, FALSE, 0);
+  gtk_grid_attach (GTK_GRID (grid), guw->status, 0, 4, 3, 1);
   gtk_widget_show (guw->status);
   g_signal_connect (guw->status, "realize", G_CALLBACK (status_realize), guw);
 
-#if 0
-  grip = gtk_statusbar_new ();
-  gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (grip), TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox), grip, FALSE, FALSE, 0);
-#endif
-  gtk_widget_show_all (hbox);
-
   g_signal_connect (guw->charmap, "status-message", G_CALLBACK (status_message), guw);
 
-  gtk_widget_show (big_vbox);
+  gtk_widget_show (grid);
 
   gtk_widget_grab_focus (GTK_WIDGET (gucharmap_charmap_get_chartable (guw->charmap)));