GNOME.org
 

[gimp] plug-ins: some more s/gtk_container_add/gtk_box_pack_start/

commit 38fd77f5e9ecba4216cca2f956e8d1714621d8c7
Author: Michael Natterer <mitch gimp org>
Date:   Sat Mar 5 10:59:56 2011 +0100

    plug-ins: some more s/gtk_container_add/gtk_box_pack_start/

 plug-ins/common/bump-map.c              |    4 ++--
 plug-ins/common/channel-mixer.c         |    6 +++---
 plug-ins/common/checkerboard.c          |    2 +-
 plug-ins/common/colormap-remap.c        |    2 +-
 plug-ins/common/curve-bend.c            |    4 ++--
 plug-ins/common/file-xmc.c              |    2 +-
 plug-ins/common/iwarp.c                 |    4 ++--
 plug-ins/common/newsprint.c             |    2 +-
 plug-ins/common/sinus.c                 |    4 ++--
 plug-ins/common/van-gogh-lic.c          |    6 +++---
 plug-ins/file-bmp/bmp-write.c           |    4 ++--
 plug-ins/gimpressionist/orientmap.c     |    8 ++++----
 plug-ins/gimpressionist/presets.c       |    2 +-
 plug-ins/imagemap/imap_cmd_guides.c     |    4 ++--
 plug-ins/imagemap/imap_default_dialog.c |   12 ++++++------
 plug-ins/imagemap/imap_edit_area_info.c |    8 ++++----
 plug-ins/imagemap/imap_main.c           |   10 +++++-----
 plug-ins/imagemap/imap_selection.c      |   10 +++++-----
 18 files changed, 47 insertions(+), 47 deletions(-)
---
diff --git a/plug-ins/common/bump-map.c b/plug-ins/common/bump-map.c
index daed9d0..bf2187e 100644
--- a/plug-ins/common/bump-map.c
+++ b/plug-ins/common/bump-map.c
@@ -794,7 +794,7 @@ bumpmap_dialog (void)
   gtk_widget_show (vbox);
 
   preview = gimp_drawable_preview_new (drawable, NULL);
-  gtk_container_add (GTK_CONTAINER (hbox), preview);
+  gtk_box_pack_start (GTK_BOX (hbox), preview, TRUE, TRUE, 0);
   gtk_widget_show (preview);
 
   g_signal_connect (preview, "invalidated",
@@ -813,7 +813,7 @@ bumpmap_dialog (void)
   gtk_widget_show (vbox);
 
   vbox = gtk_vbox_new (FALSE, 0);
-  gtk_container_add (GTK_CONTAINER (hbox), vbox);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
   table = gtk_table_new (12, 3, FALSE);
diff --git a/plug-ins/common/channel-mixer.c b/plug-ins/common/channel-mixer.c
index 91a13ea..048655e 100644
--- a/plug-ins/common/channel-mixer.c
+++ b/plug-ins/common/channel-mixer.c
@@ -665,7 +665,7 @@ cm_dialog (CmParamsType *mix,
   gtk_widget_show (hbox);
 
   button = gtk_button_new_from_stock (GTK_STOCK_OPEN);
-  gtk_container_add (GTK_CONTAINER (hbox), button);
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
   g_signal_connect (button, "clicked",
@@ -673,7 +673,7 @@ cm_dialog (CmParamsType *mix,
                     mix);
 
   button = gtk_button_new_from_stock (GTK_STOCK_SAVE);
-  gtk_container_add (GTK_CONTAINER (hbox), button);
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
   g_signal_connect (button, "clicked",
@@ -681,7 +681,7 @@ cm_dialog (CmParamsType *mix,
                     mix);
 
   button = gtk_button_new_from_stock (GIMP_STOCK_RESET);
-  gtk_container_add (GTK_CONTAINER (hbox), button);
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
   gtk_widget_show (button);
 
   g_signal_connect (button, "clicked",
diff --git a/plug-ins/common/checkerboard.c b/plug-ins/common/checkerboard.c
index ac50e35..ec1d811 100644
--- a/plug-ins/common/checkerboard.c
+++ b/plug-ins/common/checkerboard.c
@@ -365,7 +365,7 @@ checkerboard_dialog (gint32        image_ID,
   gtk_widget_show (vbox);
 
   preview = gimp_drawable_preview_new (drawable, NULL);
-  gtk_container_add (GTK_CONTAINER (vbox), preview);
+  gtk_box_pack_start (GTK_BOX (vbox), preview, TRUE, TRUE, 0);
   gtk_widget_show (preview);
   g_signal_connect_swapped (preview, "invalidated",
                             G_CALLBACK (do_checkerboard_pattern),
diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c
index 27ea87a..e99f010 100644
--- a/plug-ins/common/colormap-remap.c
+++ b/plug-ins/common/colormap-remap.c
@@ -657,7 +657,7 @@ remap_dialog (gint32  image_ID,
   iconview = gtk_icon_view_new_with_model (GTK_TREE_MODEL (store));
   g_object_unref (store);
 
-  gtk_container_add (GTK_CONTAINER (vbox), iconview);
+  gtk_box_pack_start (GTK_BOX (vbox), iconview, TRUE, TRUE, 0);
 
   gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (iconview),
                                     GTK_SELECTION_SINGLE);
diff --git a/plug-ins/common/curve-bend.c b/plug-ins/common/curve-bend.c
index 320c8c1..f2e9b64 100644
--- a/plug-ins/common/curve-bend.c
+++ b/plug-ins/common/curve-bend.c
@@ -1254,7 +1254,7 @@ bender_new_dialog (GimpDrawable *drawable)
 
   /* Left side column */
   vbox =  gtk_vbox_new (FALSE, 12);
-  gtk_container_add (GTK_CONTAINER (main_hbox), vbox);
+  gtk_box_pack_start (GTK_BOX (main_hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
   /* Preview area, top of column */
@@ -1370,7 +1370,7 @@ bender_new_dialog (GimpDrawable *drawable)
 
   /*  The curves graph  */
   frame = gimp_frame_new (_("Modify Curves"));
-  gtk_container_add (GTK_CONTAINER (main_hbox), frame);
+  gtk_box_pack_start (GTK_BOX (main_hbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
   vbox = gtk_vbox_new (FALSE, 12);
diff --git a/plug-ins/common/file-xmc.c b/plug-ins/common/file-xmc.c
index 71ebbf2..ee0e01c 100644
--- a/plug-ins/common/file-xmc.c
+++ b/plug-ins/common/file-xmc.c
@@ -1319,7 +1319,7 @@ save_dialog (const gint32 image_ID, GimpParamRegion *hotspotRange)
   gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (tmpwidget), GTK_WRAP_WORD);
   g_object_unref (textbuffer);
   gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (tmpwidget), GTK_WRAP_WORD);
-  gtk_container_add (GTK_CONTAINER (box), tmpwidget);
+  gtk_box_pack_start (GTK_BOX (box), tmpwidget, TRUE, TRUE, 0);
   gtk_widget_show (tmpwidget);
   /* tooltip */
   gimp_help_set_help_data (tmpwidget,
diff --git a/plug-ins/common/iwarp.c b/plug-ins/common/iwarp.c
index e373ed1..1c54ec5 100644
--- a/plug-ins/common/iwarp.c
+++ b/plug-ins/common/iwarp.c
@@ -1119,11 +1119,11 @@ iwarp_settings_dialog (GtkWidget *dialog,
 
                                     NULL);
 
-  gtk_container_add (GTK_CONTAINER (hbox), vbox2);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
   gtk_widget_show (vbox2);
 
   vbox3 = gtk_vbox_new (FALSE, 2);
-  gtk_container_add (GTK_CONTAINER (hbox), vbox3);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox3, TRUE, TRUE, 0);
   gtk_widget_show (vbox3);
 
   for (i = 0; i < 3; i++)
diff --git a/plug-ins/common/newsprint.c b/plug-ins/common/newsprint.c
index 1954cc0..e36ba29 100644
--- a/plug-ins/common/newsprint.c
+++ b/plug-ins/common/newsprint.c
@@ -1224,7 +1224,7 @@ newsprint_dialog (GimpDrawable *drawable)
   gtk_widget_show (vbox);
 
   vbox = gtk_vbox_new (FALSE, 12);
-  gtk_container_add (GTK_CONTAINER (hbox), vbox);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
   /* resolution settings  */
diff --git a/plug-ins/common/sinus.c b/plug-ins/common/sinus.c
index 0118279..ef0fb04 100644
--- a/plug-ins/common/sinus.c
+++ b/plug-ins/common/sinus.c
@@ -789,7 +789,7 @@ sinus_dialog (void)
       /*if in grey scale, the colors are necessarily black and white */
       label = gtk_label_new (_("The colors are white and black."));
       gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
       gtk_widget_show (label);
     }
   else
@@ -915,7 +915,7 @@ sinus_dialog (void)
 
   table = gtk_table_new (1, 3, FALSE);
   gtk_table_set_col_spacings (GTK_TABLE (table), 6);
-  gtk_container_add (GTK_CONTAINER (vbox), table);
+  gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
 
   adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
                               _("_Exponent:"), 0, 0,
diff --git a/plug-ins/common/van-gogh-lic.c b/plug-ins/common/van-gogh-lic.c
index 25725f6..c269e26 100644
--- a/plug-ins/common/van-gogh-lic.c
+++ b/plug-ins/common/van-gogh-lic.c
@@ -675,7 +675,7 @@ create_main_dialog (void)
                                     _("_Brightness"), 2, NULL,
 
                                     NULL);
-  gtk_container_add (GTK_CONTAINER (hbox), frame);
+  gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
   frame = gimp_int_radio_group_new (TRUE, _("Effect Operator"),
@@ -687,7 +687,7 @@ create_main_dialog (void)
                                     _("_Gradient"),   1, NULL,
 
                                     NULL);
-  gtk_container_add (GTK_CONTAINER (hbox), frame);
+  gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
   frame = gimp_int_radio_group_new (TRUE, _("Convolve"),
@@ -699,7 +699,7 @@ create_main_dialog (void)
                                     _("W_ith source image"), 1, NULL,
 
                                     NULL);
-  gtk_container_add (GTK_CONTAINER (hbox), frame);
+  gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
   /* Effect image menu */
diff --git a/plug-ins/file-bmp/bmp-write.c b/plug-ins/file-bmp/bmp-write.c
index caf9f24..aa1581e 100644
--- a/plug-ins/file-bmp/bmp-write.c
+++ b/plug-ins/file-bmp/bmp-write.c
@@ -890,7 +890,7 @@ save_dialog (gint channels)
 
   toggle = gtk_radio_button_new_with_label (group, "A8 R8 G8 B8");
   group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (toggle));
-  gtk_container_add (GTK_CONTAINER (vbox), toggle);
+  gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
   gtk_widget_show (toggle);
   g_signal_connect (toggle, "toggled",
                     G_CALLBACK (format_callback),
@@ -909,7 +909,7 @@ save_dialog (gint channels)
 
   toggle = gtk_radio_button_new_with_label (group, "X8 R8 G8 B8");
   group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (toggle));
-  gtk_container_add (GTK_CONTAINER (vbox), toggle);
+  gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
   gtk_widget_show (toggle);
   g_signal_connect (toggle, "toggled",
                     G_CALLBACK (format_callback),
diff --git a/plug-ins/gimpressionist/orientmap.c b/plug-ins/gimpressionist/orientmap.c
index 846eb05..6104e96 100644
--- a/plug-ins/gimpressionist/orientmap.c
+++ b/plug-ins/gimpressionist/orientmap.c
@@ -634,7 +634,7 @@ create_orientmap_dialog (GtkWidget *parent)
   gtk_widget_show (hbox);
 
   vbox = gtk_vbox_new (FALSE, 0);
-  gtk_container_add (GTK_CONTAINER (hbox), vbox);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
   frame = gimp_int_radio_group_new (TRUE, _("Type"),
@@ -647,11 +647,11 @@ create_orientmap_dialog (GtkWidget *parent)
                                     _("Vortex_3"), 3, &vector_types[3],
 
                                     NULL);
-  gtk_container_add (GTK_CONTAINER (vbox), frame);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
   orient_voronoi = tmpw = gtk_check_button_new_with_mnemonic ( _("_Voronoi"));
-  gtk_container_add (GTK_CONTAINER (vbox), tmpw);
+  gtk_box_pack_start (GTK_BOX (vbox), tmpw, TRUE, TRUE, 0);
   gtk_widget_show (tmpw);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (tmpw),
                                 pcvals.orient_voronoi);
@@ -663,7 +663,7 @@ create_orientmap_dialog (GtkWidget *parent)
 
   table2 = gtk_table_new (4, 3, FALSE);
   gtk_table_set_col_spacings (GTK_TABLE (table2), 4);
-  gtk_container_add (GTK_CONTAINER (hbox), table2);
+  gtk_box_pack_start (GTK_BOX (hbox), table2, TRUE, TRUE, 0);
   gtk_widget_show (table2);
 
   angle_adjust =
diff --git a/plug-ins/gimpressionist/presets.c b/plug-ins/gimpressionist/presets.c
index 3646d0f..947643d 100644
--- a/plug-ins/gimpressionist/presets.c
+++ b/plug-ins/gimpressionist/presets.c
@@ -671,7 +671,7 @@ create_save_preset (GtkWidget *parent)
   swin = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swin),
                                        GTK_SHADOW_IN);
-  gtk_container_add (GTK_CONTAINER (box), swin);
+  gtk_box_pack_start (GTK_BOX (box), swin, TRUE, TRUE, 0);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin),
                                   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_widget_show (swin);
diff --git a/plug-ins/imagemap/imap_cmd_guides.c b/plug-ins/imagemap/imap_cmd_guides.c
index 9a4ceb9..f65beb2 100644
--- a/plug-ins/imagemap/imap_cmd_guides.c
+++ b/plug-ins/imagemap/imap_cmd_guides.c
@@ -205,7 +205,7 @@ make_guides_dialog (void)
                      G_CALLBACK(recalc_bounds), (gpointer) data);
 
    hbox = gtk_hbox_new (FALSE, 6);
-   gtk_container_add (GTK_CONTAINER (dialog->vbox), hbox);
+   gtk_box_pack_start (GTK_BOX (dialog->vbox), hbox, TRUE, TRUE, 0);
    gtk_widget_show(hbox);
 
    label = gtk_label_new_with_mnemonic(_("Base _URL:"));
@@ -213,7 +213,7 @@ make_guides_dialog (void)
    gtk_widget_show(label);
 
    data->base_url = gtk_entry_new ();
-   gtk_container_add (GTK_CONTAINER(hbox), data->base_url);
+   gtk_box_pack_start (GTK_BOX (hbox), data->base_url, TRUE, TRUE, 0);
    gtk_widget_show(data->base_url);
 
    gtk_label_set_mnemonic_widget (GTK_LABEL (label), data->base_url);
diff --git a/plug-ins/imagemap/imap_default_dialog.c b/plug-ins/imagemap/imap_default_dialog.c
index 5f1ce92..bd6567f 100644
--- a/plug-ins/imagemap/imap_default_dialog.c
+++ b/plug-ins/imagemap/imap_default_dialog.c
@@ -170,13 +170,13 @@ default_dialog_set_label(DefaultDialog_t *dialog, const gchar *text)
 GtkWidget*
 default_dialog_add_table(DefaultDialog_t *dialog, gint rows, gint cols)
 {
-   GtkWidget *table = gtk_table_new(rows, cols, FALSE);
+  GtkWidget *table = gtk_table_new (rows, cols, FALSE);
 
-   gtk_table_set_row_spacings(GTK_TABLE(table), 6);
-   gtk_table_set_col_spacings(GTK_TABLE(table), 6);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 6);
 
-   gtk_container_add (GTK_CONTAINER(dialog->vbox), table);
-   gtk_widget_show(table);
+  gtk_box_pack_start (GTK_BOX (dialog->vbox), table, TRUE, TRUE, 0);
+  gtk_widget_show (table);
 
-   return table;
+  return table;
 }
diff --git a/plug-ins/imagemap/imap_edit_area_info.c b/plug-ins/imagemap/imap_edit_area_info.c
index d71952b..231a17a 100644
--- a/plug-ins/imagemap/imap_edit_area_info.c
+++ b/plug-ins/imagemap/imap_edit_area_info.c
@@ -179,11 +179,11 @@ append_page (GtkWidget *notebook, GtkWidget *page, const gchar *icon_name,
    gtk_widget_show(hbox);
 
    icon = gtk_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU);
-   gtk_container_add (GTK_CONTAINER (hbox), icon);
+   gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
    gtk_widget_show (icon);
 
-   label = gtk_label_new_with_mnemonic(label_name);
-   gtk_container_add (GTK_CONTAINER (hbox), label);
+   label = gtk_label_new_with_mnemonic (label_name);
+   gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
    gtk_widget_show (label);
 
    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, hbox);
@@ -207,7 +207,7 @@ create_link_tab(AreaInfoDialog_t *dialog, GtkWidget *notebook)
    gtk_widget_show(frame);
 
    subtable = gtk_table_new(2, 4, FALSE);
-   gtk_container_add(GTK_CONTAINER(frame), subtable);
+   gtk_container_add (GTK_CONTAINER(frame), subtable);
    gtk_widget_show(subtable);
 
    dialog->web_site = create_radio_button_in_table(subtable, NULL, 0, 0,
diff --git a/plug-ins/imagemap/imap_main.c b/plug-ins/imagemap/imap_main.c
index f4a2ef9..dd30702 100644
--- a/plug-ins/imagemap/imap_main.c
+++ b/plug-ins/imagemap/imap_main.c
@@ -1244,9 +1244,9 @@ dialog(GimpDrawable *drawable)
                      G_CALLBACK (gtk_main_quit),
                      NULL);
 
-   main_vbox = gtk_vbox_new(FALSE, 0);
-   gtk_container_add(GTK_CONTAINER(dlg), main_vbox);
-   gtk_widget_show(main_vbox);
+   main_vbox = gtk_vbox_new (FALSE, 0);
+   gtk_container_add (GTK_CONTAINER (dlg), main_vbox);
+   gtk_widget_show (main_vbox);
 
    init_stock_icons();
 
@@ -1258,7 +1258,7 @@ dialog(GimpDrawable *drawable)
 
    /*  Dialog area  */
    hbox = gtk_hbox_new(FALSE, 1);
-   gtk_container_add(GTK_CONTAINER(main_vbox), hbox);
+   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, TRUE, TRUE, 0);
    gtk_widget_show(hbox);
 
    tools = make_tools(dlg);
@@ -1274,7 +1274,7 @@ dialog(GimpDrawable *drawable)
                     G_CALLBACK(preview_leave), NULL);
    g_signal_connect(_preview->preview, "button-press-event",
                     G_CALLBACK(button_press), NULL);
-   gtk_container_add(GTK_CONTAINER(hbox), _preview->window);
+   gtk_box_pack_start (GTK_BOX (hbox), _preview->window, TRUE, TRUE, 0);
 
    object_list_add_geometry_cb(_shapes, geometry_changed, NULL);
    object_list_add_update_cb(_shapes, data_changed, NULL);
diff --git a/plug-ins/imagemap/imap_selection.c b/plug-ins/imagemap/imap_selection.c
index c78e7a2..eea7cae 100644
--- a/plug-ins/imagemap/imap_selection.c
+++ b/plug-ins/imagemap/imap_selection.c
@@ -333,13 +333,13 @@ make_selection(ObjectList_t *object_list)
   gtk_container_add(GTK_CONTAINER(frame), hbox);
   gtk_widget_show(hbox);
 
-  toolbar = make_selection_toolbar();
-  gtk_container_add(GTK_CONTAINER(hbox), toolbar);
+  toolbar = make_selection_toolbar ();
+  gtk_box_pack_start (GTK_BOX (hbox), toolbar, TRUE, TRUE, 0);
 
   /* Create selection */
-  frame = gimp_frame_new(_("Selection"));
-  gtk_container_add(GTK_CONTAINER(hbox), frame);
-  gtk_widget_show(frame);
+  frame = gimp_frame_new (_("Selection"));
+  gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
 
   data->store = gtk_list_store_new (1, G_TYPE_POINTER);
   data->list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (data->store));
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]