libgimpwidgets: add gtk_button_box_new() to gimp3migration.[ch]

and use it all over the place.
This commit is contained in:
Michael Natterer 2011-09-30 15:43:02 +02:00
parent a7604f706d
commit f342b50483
10 changed files with 22 additions and 10 deletions

View file

@ -117,7 +117,7 @@ gimp_overlay_dialog_class_init (GimpOverlayDialogClass *klass)
static void
gimp_overlay_dialog_init (GimpOverlayDialog *dialog)
{
dialog->action_area = gtk_hbutton_box_new ();
dialog->action_area = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog->action_area),
GTK_BUTTONBOX_END);
gtk_widget_set_parent (dialog->action_area, GTK_WIDGET (dialog));

View file

@ -37,3 +37,12 @@ gtk_box_new (GtkOrientation orientation,
else
return gtk_vbox_new (FALSE, spacing);
}
GtkWidget *
gtk_button_box_new (GtkOrientation orientation)
{
if (orientation == GTK_ORIENTATION_HORIZONTAL)
return gtk_hbutton_box_new ();
else
return gtk_vbutton_box_new ();
}

View file

@ -33,8 +33,9 @@
* along. This file will be removed in GIMP 3.
*/
GtkWidget * gtk_box_new (GtkOrientation orientation,
gint spacing);
GtkWidget * gtk_box_new (GtkOrientation orientation,
gint spacing);
GtkWidget * gtk_button_box_new (GtkOrientation orientation);
#endif /* __GIMP_3_MIGRATION_H__ */

View file

@ -32,6 +32,7 @@
#include "gimppropwidgets.h"
#include "gimpstock.h"
#include "gimpwidgets.h"
#include "gimp3migration.h"
#include "libgimp/libgimp-intl.h"
@ -292,7 +293,7 @@ gimp_page_selector_init (GimpPageSelector *selector)
gtk_box_pack_start (GTK_BOX (selector), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
hbbox = gtk_hbutton_box_new ();
hbbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (hbox), hbbox, FALSE, FALSE, 0);
gtk_widget_show (hbbox);

View file

@ -390,3 +390,4 @@ EXPORTS
gimp_zoom_model_zoom_step
gimp_zoom_type_get_type
gtk_box_new
gtk_button_box_new

View file

@ -1222,7 +1222,7 @@ CML_explorer_dialog (void)
gtk_container_add (GTK_CONTAINER (frame), preview);
gtk_widget_show (preview);
bbox = gtk_vbutton_box_new ();
bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
gtk_widget_show (bbox);
@ -1259,7 +1259,7 @@ CML_explorer_dialog (void)
random_sensitives[2].widget = button;
random_sensitives[2].logic = FALSE;
bbox = gtk_vbutton_box_new ();
bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
gtk_widget_show (bbox);

View file

@ -805,7 +805,7 @@ gui_multi (void)
gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 0);
h_but_box = gtk_hbutton_box_new ();
h_but_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (h_but_box), GTK_BUTTONBOX_START);
del = gtk_button_new_with_label ("Remove the selected pages");

View file

@ -1387,7 +1387,7 @@ newsprint_dialog (GimpDrawable *drawable)
gtk_widget_show (hbox);
/* channel lock & factory defaults button */
hbox = gtk_hbutton_box_new ();
hbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_set_spacing (GTK_BOX (hbox), 6);
gtk_box_pack_start (GTK_BOX (st.vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);

View file

@ -867,7 +867,7 @@ dialog_run (void)
G_CALLBACK (dialog_toggle_antialaising),
NULL);
bbox = gtk_hbutton_box_new ();
bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
gtk_widget_show (bbox);

View file

@ -1028,7 +1028,7 @@ flame_dialog (void)
gtk_box_pack_start (GTK_BOX (box), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
vbbox= gtk_vbutton_box_new ();
vbbox= gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_box_set_homogeneous (GTK_BOX (vbbox), FALSE);
gtk_box_set_spacing (GTK_BOX (vbbox), 6);
gtk_box_pack_start (GTK_BOX (vbox), vbbox, FALSE, FALSE, 0);