From 72b0ef397f6d502175bb87fca44eb84a80b595fc Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 30 Sep 2011 10:53:32 +0200 Subject: [PATCH] libgimp: use gtk_box_new() --- libgimp/gimpbrushselectbutton.c | 2 +- libgimp/gimpexport.c | 10 +++++----- libgimp/gimpfontselectbutton.c | 2 +- libgimp/gimpmenu.c | 6 ++++-- libgimp/gimppaletteselectbutton.c | 2 +- libgimp/gimppatternselectbutton.c | 2 +- libgimp/gimpprocview.c | 6 +++--- libgimp/gimpzoompreview.c | 2 +- 8 files changed, 17 insertions(+), 15 deletions(-) diff --git a/libgimp/gimpbrushselectbutton.c b/libgimp/gimpbrushselectbutton.c index 8480e0bdf0..019c400bcc 100644 --- a/libgimp/gimpbrushselectbutton.c +++ b/libgimp/gimpbrushselectbutton.c @@ -894,7 +894,7 @@ gimp_brush_select_button_create_inside (GimpBrushSelectButton *brush_button) gtk_widget_push_composite_child (); - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); diff --git a/libgimp/gimpexport.c b/libgimp/gimpexport.c index 25c7493258..e0f1b28a27 100644 --- a/libgimp/gimpexport.c +++ b/libgimp/gimpexport.c @@ -445,7 +445,7 @@ confirm_save_dialog (const gchar *message, gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); gimp_window_set_transient (GTK_WINDOW (dialog)); - hbox = gtk_hbox_new (FALSE, 12); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, TRUE, TRUE, 0); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); @@ -457,7 +457,7 @@ confirm_save_dialog (const gchar *message, gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); gtk_widget_show (image); - main_vbox = gtk_vbox_new (FALSE, 12); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_box_pack_start (GTK_BOX (hbox), main_vbox, FALSE, FALSE, 0); gtk_widget_show (main_vbox); @@ -528,7 +528,7 @@ export_dialog (GSList *actions, gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); gimp_window_set_transient (GTK_WINDOW (dialog)); - hbox = gtk_hbox_new (FALSE, 12); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, TRUE, TRUE, 0); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); @@ -540,7 +540,7 @@ export_dialog (GSList *actions, gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); gtk_widget_show (image); - main_vbox = gtk_vbox_new (FALSE, 12); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_box_pack_start (GTK_BOX (hbox), main_vbox, FALSE, FALSE, 0); gtk_widget_show (main_vbox); @@ -573,7 +573,7 @@ export_dialog (GSList *actions, gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); gtk_widget_show (frame); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_add (GTK_CONTAINER (frame), vbox); if (action->possibilities[0] && action->possibilities[1]) diff --git a/libgimp/gimpfontselectbutton.c b/libgimp/gimpfontselectbutton.c index a51ed41b9a..1135b723f3 100644 --- a/libgimp/gimpfontselectbutton.c +++ b/libgimp/gimpfontselectbutton.c @@ -443,7 +443,7 @@ gimp_font_select_button_create_inside (GimpFontSelectButton *font_button) button = gtk_button_new (); - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_container_add (GTK_CONTAINER (button), hbox); image = gtk_image_new_from_stock (GIMP_STOCK_FONT, GTK_ICON_SIZE_BUTTON); diff --git a/libgimp/gimpmenu.c b/libgimp/gimpmenu.c index 67df926579..a8a5bfa034 100644 --- a/libgimp/gimpmenu.c +++ b/libgimp/gimpmenu.c @@ -22,6 +22,8 @@ #include +#include "libgimpwidgets/gimpwidgets.h" + #include "gimp.h" #include "gimppixbuf.h" @@ -428,11 +430,11 @@ gimp_menu_add_item (GtkWidget *menu, G_CALLBACK (gimp_menu_callback), GINT_TO_POINTER (any_ID)); - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_container_add (GTK_CONTAINER (menuitem), hbox); gtk_widget_show (hbox); - vbox = gtk_vbox_new (FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0); gtk_widget_show (vbox); diff --git a/libgimp/gimppaletteselectbutton.c b/libgimp/gimppaletteselectbutton.c index 0178d4e15c..ab8d62b5b1 100644 --- a/libgimp/gimppaletteselectbutton.c +++ b/libgimp/gimppaletteselectbutton.c @@ -460,7 +460,7 @@ gimp_palette_select_button_create_inside (GimpPaletteSelectButton *palette_butto button = gtk_button_new (); - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_container_add (GTK_CONTAINER (button), hbox); image = gtk_image_new_from_stock (GIMP_STOCK_PALETTE, GTK_ICON_SIZE_BUTTON); diff --git a/libgimp/gimppatternselectbutton.c b/libgimp/gimppatternselectbutton.c index 9878a380f0..04696b2c7e 100644 --- a/libgimp/gimppatternselectbutton.c +++ b/libgimp/gimppatternselectbutton.c @@ -692,7 +692,7 @@ gimp_pattern_select_button_create_inside (GimpPatternSelectButton *pattern_butto gtk_widget_push_composite_child (); - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); diff --git a/libgimp/gimpprocview.c b/libgimp/gimpprocview.c index d411bca1d4..217ba2160c 100644 --- a/libgimp/gimpprocview.c +++ b/libgimp/gimpprocview.c @@ -116,7 +116,7 @@ gimp_proc_view_new (const gchar *name, if (blurb && help && ! strcmp (blurb, help)) help = NULL; - main_vbox = gtk_vbox_new (FALSE, 12); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); /* show the name */ @@ -126,7 +126,7 @@ gimp_proc_view_new (const gchar *name, gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); gtk_widget_show (frame); - vbox = gtk_vbox_new (FALSE, 8); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_widget_show (vbox); @@ -199,7 +199,7 @@ gimp_proc_view_new (const gchar *name, gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); gtk_widget_show (frame); - vbox = gtk_vbox_new (FALSE, 8); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_widget_show (vbox); diff --git a/libgimp/gimpzoompreview.c b/libgimp/gimpzoompreview.c index 99155b5a7c..b8e1bfc585 100644 --- a/libgimp/gimpzoompreview.c +++ b/libgimp/gimpzoompreview.c @@ -689,7 +689,7 @@ gimp_zoom_preview_set_model (GimpZoomPreview *preview, box = gimp_preview_get_controls (GIMP_PREVIEW (preview)); g_return_if_fail (GTK_IS_BOX (box)); - button_bar = gtk_hbox_new (FALSE, 2); + button_bar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); gtk_box_pack_end (GTK_BOX (box), button_bar, FALSE, FALSE, 0); gtk_widget_show (button_bar);