diff options
Diffstat (limited to 'gtk')
32 files changed, 85 insertions, 83 deletions
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index a47a247fb7..ac09e5cf20 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -574,7 +574,7 @@ gtk_about_dialog_init (GtkAboutDialog *about) /* Widgets */ gtk_widget_push_composite_child (); - vbox = gtk_vbox_new (FALSE, 8); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0); @@ -597,7 +597,7 @@ gtk_about_dialog_init (GtkAboutDialog *about) gtk_label_set_justify (GTK_LABEL (priv->copyright_label), GTK_JUSTIFY_CENTER); gtk_box_pack_start (GTK_BOX (vbox), priv->copyright_label, FALSE, FALSE, 0); - hbox = gtk_hbox_new (TRUE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, FALSE, 0); priv->website_label = button = gtk_label_new (""); diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index 7f5803d09e..3fc0616bb0 100644 --- a/gtk/gtkassistant.c +++ b/gtk/gtkassistant.c @@ -805,7 +805,7 @@ gtk_assistant_init (GtkAssistant *assistant) gtk_widget_show (priv->sidebar_image); /* Action area */ - priv->action_area = gtk_hbox_new (FALSE, 6); + priv->action_area = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6); priv->close = gtk_button_new_from_stock (GTK_STOCK_CLOSE); priv->apply = gtk_button_new_from_stock (GTK_STOCK_APPLY); diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index ab3fe77f02..3c81cbfca0 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -1025,9 +1025,9 @@ gtk_button_construct_child (GtkButton *button) if (priv->image_position == GTK_POS_LEFT || priv->image_position == GTK_POS_RIGHT) - box = gtk_hbox_new (FALSE, image_spacing); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, image_spacing); else - box = gtk_vbox_new (FALSE, image_spacing); + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, image_spacing); if (priv->align_set) align = gtk_alignment_new (priv->xalign, priv->yalign, 0.0, 0.0); diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index ef18b34813..4bd1e50412 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -381,10 +381,10 @@ gtk_color_selection_init (GtkColorSelection *colorsel) priv->default_set = FALSE; priv->default_alpha_set = FALSE; - top_hbox = gtk_hbox_new (FALSE, 12); + top_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12); gtk_box_pack_start (GTK_BOX (colorsel), top_hbox, FALSE, FALSE, 0); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6); priv->triangle_colorsel = gtk_hsv_new (); g_signal_connect (priv->triangle_colorsel, "changed", G_CALLBACK (hsv_changed), colorsel); @@ -394,7 +394,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel) gtk_widget_set_tooltip_text (priv->triangle_colorsel, _("Select the color you want from the outer ring. Select the darkness or lightness of that color using the inner triangle.")); - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6); gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); frame = gtk_frame_new (NULL); @@ -418,7 +418,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel) gtk_widget_set_tooltip_text (button, _("Click the eyedropper, then click a color anywhere on your screen to select that color.")); - top_right_vbox = gtk_vbox_new (FALSE, 6); + top_right_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6); gtk_box_pack_start (GTK_BOX (top_hbox), top_right_vbox, FALSE, FALSE, 0); table = gtk_table_new (8, 6, FALSE); gtk_box_pack_start (GTK_BOX (top_right_vbox), table, FALSE, FALSE, 0); @@ -507,7 +507,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel) } } set_selected_palette (colorsel, 0, 0); - priv->palette_frame = gtk_vbox_new (FALSE, 6); + priv->palette_frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6); label = gtk_label_new_with_mnemonic (_("_Palette:")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (priv->palette_frame), label, FALSE, FALSE, 0); @@ -1029,7 +1029,7 @@ color_sample_new (GtkColorSelection *colorsel) priv = colorsel->private_data; - priv->sample_area = gtk_hbox_new (FALSE, 0); + priv->sample_area = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0); priv->old_sample = gtk_drawing_area_new (); priv->cur_sample = gtk_drawing_area_new (); diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index e2ec211c63..d36990ea8b 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -3030,7 +3030,7 @@ gtk_combo_box_menu_setup (GtkComboBox *combo_box, gtk_widget_set_parent (priv->button, gtk_widget_get_parent (child)); - priv->box = gtk_hbox_new (FALSE, 0); + priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0); gtk_container_add (GTK_CONTAINER (priv->button), priv->box); priv->separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL); diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c index 79bc61086d..b64987a5c9 100644 --- a/gtk/gtkcustompaperunixdialog.c +++ b/gtk/gtkcustompaperunixdialog.c @@ -514,7 +514,7 @@ new_unit_widget (GtkCustomPaperUnixDialog *dialog, data = g_new0 (UnitWidget, 1); data->display_unit = unit; - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6); button = gtk_spin_button_new_with_range (0.0, 9999.0, 1); if (unit == GTK_UNIT_INCH) @@ -943,7 +943,7 @@ wrap_in_frame (const gchar *label, gtk_label_set_markup (GTK_LABEL (label_widget), bold_text); g_free (bold_text); - frame = gtk_vbox_new (FALSE, 6); + frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6); gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE, 0); alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); @@ -981,12 +981,12 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) gtk_container_set_border_width (GTK_CONTAINER (action_area), 5); gtk_box_set_spacing (GTK_BOX (action_area), 6); - hbox = gtk_hbox_new (FALSE, 18); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 18); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6); gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); @@ -1022,7 +1022,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) gtk_container_add (GTK_CONTAINER (scrolled), treeview); gtk_widget_show (treeview); - button_box = gtk_hbox_new (FALSE, 6); + button_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox), button_box, FALSE, FALSE, 0); gtk_widget_show (button_box); @@ -1046,7 +1046,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) user_units = _gtk_print_get_default_user_units (); - vbox = gtk_vbox_new (FALSE, 18); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 18); priv->values_box = vbox; gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); @@ -1137,7 +1137,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) 1, 2, 3, 4, GTK_FILL, 0, 0, 0); gtk_widget_show (widget); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0); gtk_table_attach (GTK_TABLE (table), hbox, 0, 2, 4, 5, GTK_FILL | GTK_EXPAND, 0, 0, 0); gtk_widget_show (hbox); diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index 681899389f..0b627c16e2 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -257,7 +257,7 @@ gtk_dialog_init (GtkDialog *dialog) G_CALLBACK (gtk_dialog_delete_event_handler), NULL); - priv->vbox = gtk_vbox_new (FALSE, 0); + priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0); gtk_container_add (GTK_CONTAINER (dialog), priv->vbox); gtk_widget_show (priv->vbox); diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index 2516f3dc4f..df83aaec52 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -528,7 +528,7 @@ gtk_entry_completion_init (GtkEntryCompletion *completion) gtk_widget_show (popup_frame); gtk_container_add (GTK_CONTAINER (priv->popup_window), popup_frame); - priv->vbox = gtk_vbox_new (FALSE, 0); + priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0); gtk_container_add (GTK_CONTAINER (popup_frame), priv->vbox); gtk_container_add (GTK_CONTAINER (priv->scrolled_window), priv->tree_view); diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index 3b2acc3397..4f08f76cb4 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -441,7 +441,7 @@ gtk_file_chooser_button_init (GtkFileChooserButton *button) gtk_container_add (GTK_CONTAINER (button), priv->button); gtk_widget_show (priv->button); - box = gtk_hbox_new (FALSE, 4); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 4); gtk_container_add (GTK_CONTAINER (priv->button), box); gtk_widget_show (box); diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 5abcd27a0d..3aac30a15b 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -3706,7 +3706,7 @@ shortcuts_pane_create (GtkFileChooserDefault *impl, GtkWidget *hbox; GtkWidget *widget; - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6); gtk_widget_show (vbox); /* Shortcuts tree */ @@ -3716,7 +3716,7 @@ shortcuts_pane_create (GtkFileChooserDefault *impl, /* Box for buttons */ - hbox = gtk_hbox_new (TRUE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 6); gtk_size_group_add_widget (size_group, hbox); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -4422,12 +4422,13 @@ file_pane_create (GtkFileChooserDefault *impl, GtkWidget *hbox; GtkWidget *widget; - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6); gtk_widget_show (vbox); /* Box for lists and preview */ - hbox = gtk_hbox_new (FALSE, PREVIEW_HBOX_SPACING); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, + FALSE, PREVIEW_HBOX_SPACING); gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); @@ -4438,13 +4439,13 @@ file_pane_create (GtkFileChooserDefault *impl, /* Preview */ - impl->preview_box = gtk_vbox_new (FALSE, 12); + impl->preview_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 12); gtk_box_pack_start (GTK_BOX (hbox), impl->preview_box, FALSE, FALSE, 0); /* Don't show preview box initially */ /* Filter combo */ - impl->filter_combo_hbox = gtk_hbox_new (FALSE, 12); + impl->filter_combo_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12); widget = filter_create (impl); @@ -4632,7 +4633,7 @@ save_widgets_create (GtkFileChooserDefault *impl) location_switch_to_path_bar (impl); - vbox = gtk_vbox_new (FALSE, 12); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 12); table = gtk_table_new (2, 2, FALSE); gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); @@ -4972,10 +4973,10 @@ browse_widgets_create (GtkFileChooserDefault *impl) /* size group is used by the [+][-] buttons and the filter combo */ size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL); - vbox = gtk_vbox_new (FALSE, 12); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 12); /* Location widgets */ - impl->browse_path_bar_hbox = gtk_hbox_new (FALSE, 12); + impl->browse_path_bar_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12); gtk_box_pack_start (GTK_BOX (vbox), impl->browse_path_bar_hbox, FALSE, FALSE, 0); gtk_widget_show (impl->browse_path_bar_hbox); @@ -5005,7 +5006,7 @@ browse_widgets_create (GtkFileChooserDefault *impl) /* Box for the location label and entry */ - impl->location_entry_box = gtk_hbox_new (FALSE, 12); + impl->location_entry_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12); gtk_box_pack_start (GTK_BOX (vbox), impl->location_entry_box, FALSE, FALSE, 0); impl->location_label = gtk_label_new_with_mnemonic (_("_Location:")); @@ -8941,7 +8942,7 @@ search_setup_widgets (GtkFileChooserDefault *impl) GtkWidget *image; gchar *tmp; - impl->search_hbox = gtk_hbox_new (FALSE, 12); + impl->search_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12); /* Image */ @@ -9371,7 +9372,7 @@ recent_hide_entry (GtkFileChooserDefault *impl) GtkWidget *image; gchar *tmp; - impl->recent_hbox = gtk_hbox_new (FALSE, 12); + impl->recent_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12); /* Image */ image = gtk_image_new_from_icon_name ("document-open-recent", GTK_ICON_SIZE_BUTTON); diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c index fb19688db3..e3458ff3cb 100644 --- a/gtk/gtkfontbutton.c +++ b/gtk/gtkfontbutton.c @@ -780,7 +780,7 @@ gtk_font_button_create_inside (GtkFontButton *font_button) gtk_widget_push_composite_child (); - widget = gtk_hbox_new (FALSE, 0); + widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0); font_button->priv->font_label = gtk_label_new (_("Font")); diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 394ff4559f..7dfcfbdb2a 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -551,7 +551,7 @@ gtk_font_selection_init (GtkFontSelection *fontsel) } - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6); gtk_widget_show (vbox); gtk_box_pack_start (GTK_BOX (fontsel), vbox, FALSE, TRUE, 0); @@ -561,7 +561,7 @@ gtk_font_selection_init (GtkFontSelection *fontsel) gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0); - text_box = gtk_hbox_new (FALSE, 0); + text_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0); gtk_widget_show (text_box); gtk_box_pack_start (GTK_BOX (vbox), text_box, FALSE, TRUE, 0); diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c index 273be407a1..f3855de956 100644 --- a/gtk/gtkinfobar.c +++ b/gtk/gtkinfobar.c @@ -612,7 +612,7 @@ gtk_info_bar_init (GtkInfoBar *info_bar) GTK_TYPE_INFO_BAR, GtkInfoBarPrivate); - content_area = gtk_hbox_new (FALSE, 0); + content_area = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0); gtk_widget_show (content_area); gtk_box_pack_start (GTK_BOX (info_bar), content_area, TRUE, TRUE, 0); diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 4240325d3b..f36a9d5548 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -2158,8 +2158,8 @@ gtk_menu_set_tearoff_state (GtkMenu *menu, if (toplevel != NULL) gtk_window_set_transient_for (GTK_WINDOW (menu->tearoff_window), GTK_WINDOW (toplevel)); - - menu->tearoff_hbox = gtk_hbox_new (FALSE, FALSE); + + menu->tearoff_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0); gtk_container_add (GTK_CONTAINER (menu->tearoff_window), menu->tearoff_hbox); height = gdk_window_get_height (gtk_widget_get_window (GTK_WIDGET (menu))); diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c index 940b4f20a0..4d1e02620a 100644 --- a/gtk/gtkmenutoolbutton.c +++ b/gtk/gtkmenutoolbutton.c @@ -77,12 +77,12 @@ gtk_menu_tool_button_construct_contents (GtkMenuToolButton *button) if (orientation == GTK_ORIENTATION_HORIZONTAL) { - box = gtk_hbox_new (FALSE, 0); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0); gtk_arrow_set (GTK_ARROW (priv->arrow), GTK_ARROW_DOWN, GTK_SHADOW_NONE); } else { - box = gtk_vbox_new (FALSE, 0); + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0); gtk_arrow_set (GTK_ARROW (priv->arrow), GTK_ARROW_RIGHT, GTK_SHADOW_NONE); } @@ -398,7 +398,7 @@ gtk_menu_tool_button_init (GtkMenuToolButton *button) gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (button), FALSE); - box = gtk_hbox_new (FALSE, 0); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0); real_button = gtk_bin_get_child (GTK_BIN (button)); g_object_ref (real_button); diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c index d8fa79a28c..652b5a6815 100644 --- a/gtk/gtkmessagedialog.c +++ b/gtk/gtkmessagedialog.c @@ -347,8 +347,8 @@ gtk_message_dialog_init (GtkMessageDialog *dialog) gtk_label_set_selectable (GTK_LABEL (priv->secondary_label), TRUE); gtk_misc_set_alignment (GTK_MISC (priv->secondary_label), 0.0, 0.0); - hbox = gtk_hbox_new (FALSE, 12); - priv->message_area = gtk_vbox_new (FALSE, 12); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12); + priv->message_area = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 12); gtk_box_pack_start (GTK_BOX (priv->message_area), priv->label, FALSE, FALSE, 0); diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c index 8023dbfaf9..130090f2f1 100644 --- a/gtk/gtkmountoperation.c +++ b/gtk/gtkmountoperation.c @@ -498,7 +498,7 @@ gtk_mount_operation_ask_password (GMountOperation *mount_op, -1); /* Build contents */ - hbox = gtk_hbox_new (FALSE, 12); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0); @@ -508,7 +508,7 @@ gtk_mount_operation_ask_password (GMountOperation *mount_op, gtk_misc_set_alignment (GTK_MISC (icon), 0.5, 0.0); gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); - main_vbox = gtk_vbox_new (FALSE, 18); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 18); gtk_box_pack_start (GTK_BOX (hbox), main_vbox, TRUE, TRUE, 0); secondary = strstr (message, "\n"); @@ -539,7 +539,7 @@ gtk_mount_operation_ask_password (GMountOperation *mount_op, FALSE, FALSE, 0); } - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6); gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0); can_anonymous = flags & G_ASK_PASSWORD_ANONYMOUS_SUPPORTED; @@ -551,7 +551,7 @@ gtk_mount_operation_ask_password (GMountOperation *mount_op, GtkWidget *choice; GSList *group; - anon_box = gtk_vbox_new (FALSE, 6); + anon_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox), anon_box, FALSE, FALSE, 0); @@ -625,7 +625,7 @@ gtk_mount_operation_ask_password (GMountOperation *mount_op, GSList *group; GPasswordSave password_save; - remember_box = gtk_vbox_new (FALSE, 6); + remember_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox), remember_box, FALSE, FALSE, 0); @@ -1218,7 +1218,7 @@ create_show_processes_dialog (GMountOperation *op, gtk_window_set_title (GTK_WINDOW (dialog), ""); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - vbox = gtk_vbox_new (FALSE, 12); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0); diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c index 3036f5ceab..93eecbabf6 100644 --- a/gtk/gtkpagesetupunixdialog.c +++ b/gtk/gtkpagesetupunixdialog.c @@ -870,7 +870,7 @@ create_radio_button (GSList *group, image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_LARGE_TOOLBAR); gtk_stock_lookup (stock_id, &item); label = gtk_label_new (item.label); - hbox = gtk_hbox_new (0, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0, 6); gtk_container_add (GTK_CONTAINER (radio_button), hbox); gtk_container_add (GTK_CONTAINER (hbox), image); gtk_container_add (GTK_CONTAINER (hbox), label); diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index d5447e8cd0..60af22f31c 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -1528,7 +1528,7 @@ make_directory_button (GtkPathBar *path_bar, button_data->label = gtk_label_new (NULL); label_alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); gtk_container_add (GTK_CONTAINER (label_alignment), button_data->label); - child = gtk_hbox_new (FALSE, 2); + child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 2); gtk_box_pack_start (GTK_BOX (child), button_data->image, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (child), label_alignment, FALSE, FALSE, 0); break; diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c index 60c12b7302..ce35f1c654 100644 --- a/gtk/gtkprintbackend.c +++ b/gtk/gtkprintbackend.c @@ -753,7 +753,7 @@ request_password (GtkPrintBackend *backend, gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); - main_box = gtk_hbox_new (FALSE, 0); + main_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0); /* Left */ icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG); @@ -762,7 +762,7 @@ request_password (GtkPrintBackend *backend, /* Right */ - vbox = gtk_vbox_new (FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0); gtk_widget_set_size_request (GTK_WIDGET (vbox), 320, -1); /* Right - 1. */ @@ -789,7 +789,7 @@ request_password (GtkPrintBackend *backend, priv->auth_info[i] = g_strdup (ai_default[i]); if (ai_display[i] != NULL) { - box = gtk_hbox_new (TRUE, 0); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0); label = gtk_label_new (ai_display[i]); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c index 28cc5bfba8..12301d8829 100644 --- a/gtk/gtkprinteroptionwidget.c +++ b/gtk/gtkprinteroptionwidget.c @@ -739,7 +739,7 @@ construct_widgets (GtkPrinterOptionWidget *widget) case GTK_PRINTER_OPTION_TYPE_ALTERNATIVE: group = NULL; - priv->box = gtk_hbox_new (FALSE, 12); + priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12); gtk_widget_show (priv->box); gtk_box_pack_start (GTK_BOX (widget), priv->box, TRUE, TRUE, 0); for (i = 0; i < source->num_choices; i++) diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c index 032e1c2e87..90c76a2ce7 100644 --- a/gtk/gtkprintunixdialog.c +++ b/gtk/gtkprintunixdialog.c @@ -1140,7 +1140,7 @@ wrap_in_frame (const gchar *label, gtk_label_set_markup (GTK_LABEL (label_widget), bold_text); g_free (bold_text); - frame = gtk_vbox_new (FALSE, 6); + frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6); gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE, 0); alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); @@ -1189,7 +1189,7 @@ add_option_to_extension_point (GtkPrinterOption *option, gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); - hbox = gtk_hbox_new (FALSE, 12); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -2100,11 +2100,11 @@ create_main_page (GtkPrintUnixDialog *dialog) GtkWidget *custom_input; const gchar *range_tooltip; - main_vbox = gtk_vbox_new (FALSE, 18); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 18); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); gtk_widget_show (main_vbox); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6); gtk_box_pack_start (GTK_BOX (main_vbox), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); @@ -2170,12 +2170,12 @@ create_main_page (GtkPrintUnixDialog *dialog) gtk_widget_show (treeview); gtk_container_add (GTK_CONTAINER (scrolled), treeview); - custom_input = gtk_hbox_new (FALSE, 18); + custom_input = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 18); gtk_widget_show (custom_input); gtk_box_pack_start (GTK_BOX (vbox), custom_input, FALSE, FALSE, 0); priv->extension_point = custom_input; - hbox = gtk_hbox_new (FALSE, 18); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 18); gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0); @@ -3300,11 +3300,11 @@ create_page_setup_page (GtkPrintUnixDialog *dialog) GtkWidget *combo, *spinbutton, *draw; GtkCellRenderer *cell; - main_vbox = gtk_vbox_new (FALSE, 18); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 18); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); gtk_widget_show (main_vbox); - hbox = gtk_hbox_new (FALSE, 18); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 18); gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0); @@ -3390,7 +3390,7 @@ create_page_setup_page (GtkPrintUnixDialog *dialog) 0, 1, 4, 5, GTK_FILL, 0, 0, 0); - hbox2 = gtk_hbox_new (FALSE, 6); + hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6); gtk_widget_show (hbox2); gtk_table_attach (GTK_TABLE (table), hbox2, 1, 2, 4, 5, GTK_FILL, 0, @@ -3509,7 +3509,7 @@ create_page_setup_page (GtkPrintUnixDialog *dialog) /* Add the page layout preview */ - hbox2 = gtk_hbox_new (FALSE, 0); + hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0); gtk_widget_show (hbox2); gtk_box_pack_start (GTK_BOX (main_vbox), hbox2, TRUE, TRUE, 0); @@ -3759,7 +3759,7 @@ create_advanced_page (GtkPrintUnixDialog *dialog) GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - main_vbox = gtk_vbox_new (FALSE, 18); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 18); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); gtk_widget_show (main_vbox); @@ -3793,7 +3793,7 @@ populate_dialog (GtkPrintUnixDialog *print_dialog) gtk_container_set_border_width (GTK_CONTAINER (action_area), 5); gtk_box_set_spacing (GTK_BOX (action_area), 6); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); @@ -3822,7 +3822,7 @@ populate_dialog (GtkPrintUnixDialog *print_dialog) &priv->finishing_page); create_advanced_page (print_dialog); - priv->conflicts_widget = conflict_hbox = gtk_hbox_new (FALSE, 12); + priv->conflicts_widget = conflict_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12); gtk_box_pack_end (GTK_BOX (vbox), conflict_hbox, FALSE, FALSE, 0); image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU); gtk_widget_show (image); diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index 7a51b9525d..b412044eb2 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -73,7 +73,7 @@ * * GtkWidget *window, *radio1, *radio2, *box, *entry; * window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - * box = gtk_vbox_new (TRUE, 2); + * box = gtk_box_new (GTK_ORIENTATION_VERTICAL, TRUE, 2); * * /* Create a radio button with a GtkEntry widget */ * radio1 = gtk_radio_button_new (NULL); diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c index 5445c65a08..41b7dd1ea8 100644 --- a/gtk/gtkrecentchooserdefault.c +++ b/gtk/gtkrecentchooserdefault.c @@ -473,7 +473,7 @@ gtk_recent_chooser_default_constructor (GType type, GDK_ACTION_COPY); gtk_drag_source_add_uri_targets (impl->recent_view); - impl->filter_combo_hbox = gtk_hbox_new (FALSE, 12); + impl->filter_combo_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 12); impl->filter_combo = gtk_combo_box_text_new (); gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (impl->filter_combo), FALSE); diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c index 243873b4c4..924f657e10 100644 --- a/gtk/gtkscalebutton.c +++ b/gtk/gtkscalebutton.c @@ -390,7 +390,7 @@ gtk_scale_button_init (GtkScaleButton *button) gtk_container_add (GTK_CONTAINER (priv->dock), frame); /* box for scale and +/- buttons */ - priv->box = gtk_vbox_new (FALSE, 0); + priv->box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0); gtk_container_add (GTK_CONTAINER (frame), priv->box); /* + */ diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c index cee0143617..8ead97d5f1 100644 --- a/gtk/gtkstatusbar.c +++ b/gtk/gtkstatusbar.c @@ -211,7 +211,7 @@ gtk_statusbar_init (GtkStatusbar *statusbar) gtk_box_pack_start (box, priv->frame, TRUE, TRUE, 0); gtk_widget_show (priv->frame); - message_area = gtk_hbox_new (FALSE, 4); + message_area = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 4); gtk_container_add (GTK_CONTAINER (priv->frame), message_area); gtk_widget_show (message_area); diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 1b94b23bfe..e2876d8fb5 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -510,9 +510,9 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item) case GTK_TOOLBAR_BOTH: if (text_orientation == GTK_ORIENTATION_HORIZONTAL) - box = gtk_vbox_new (FALSE, icon_spacing); + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, icon_spacing); else - box = gtk_hbox_new (FALSE, icon_spacing); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, icon_spacing); if (icon) gtk_box_pack_start (GTK_BOX (box), icon, TRUE, TRUE, 0); gtk_box_pack_end (GTK_BOX (box), label, FALSE, TRUE, 0); @@ -522,7 +522,7 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item) case GTK_TOOLBAR_BOTH_HORIZ: if (text_orientation == GTK_ORIENTATION_HORIZONTAL) { - box = gtk_hbox_new (FALSE, icon_spacing); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, icon_spacing); if (icon) gtk_box_pack_start (GTK_BOX (box), icon, label? FALSE : TRUE, TRUE, 0); if (label) @@ -530,7 +530,7 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item) } else { - box = gtk_vbox_new (FALSE, icon_spacing); + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, icon_spacing); if (icon) gtk_box_pack_end (GTK_BOX (box), icon, label ? FALSE : TRUE, TRUE, 0); if (label) diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c index 8ef7754dde..f9658df988 100644 --- a/gtk/gtktooltip.c +++ b/gtk/gtktooltip.c @@ -221,7 +221,8 @@ gtk_tooltip_init (GtkTooltip *tooltip) g_signal_connect_swapped (tooltip->window, "draw", G_CALLBACK (gtk_tooltip_paint_window), tooltip); - tooltip->box = gtk_hbox_new (FALSE, style->xthickness); + tooltip->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, + FALSE, style->xthickness); gtk_container_add (GTK_CONTAINER (tooltip->alignment), tooltip->box); gtk_widget_show (tooltip->box); diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 619e75ea01..4a48d3c48c 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -10368,7 +10368,7 @@ gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view) gtk_widget_show (frame); gtk_container_add (GTK_CONTAINER (tree_view->priv->search_window), frame); - vbox = gtk_vbox_new (FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0); gtk_widget_show (vbox); gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_container_set_border_width (GTK_CONTAINER (vbox), 3); diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 161eb6d315..3ea185af29 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -874,7 +874,7 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column) tree_column->alignment = gtk_alignment_new (tree_column->xalign, 0.5, 0.0, 0.0); - hbox = gtk_hbox_new (FALSE, 2); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 2); tree_column->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_IN); if (tree_column->child) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 216054cbcd..2073f17dc1 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -9066,7 +9066,7 @@ gtk_XParseGeometry (const char *string, * gtk_init (&argc, &argv); * * window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - * vbox = gtk_vbox_new (FALSE, 0); + * vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0); * * gtk_container_add (GTK_CONTAINER (window), vbox); * fill_with_content (vbox); diff --git a/gtk/tests/crossingevents.c b/gtk/tests/crossingevents.c index 55eaaf3ce2..30d7dd6819 100644 --- a/gtk/tests/crossingevents.c +++ b/gtk/tests/crossingevents.c @@ -144,7 +144,7 @@ sensitivity_setup (CrossingTest *test, test->eventbox = gtk_event_box_new (); gtk_widget_set_name (test->eventbox, "E"); - GtkWidget *vbox = gtk_vbox_new (FALSE, 10); + GtkWidget *vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10); gtk_container_add (GTK_CONTAINER (test->window), frame); gtk_container_add (GTK_CONTAINER (frame), test->eventbox); gtk_container_add (GTK_CONTAINER (test->eventbox), vbox); |