callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use gtk_dialog_get_content_area() instead of dialog->vbox

Browse Source
This commit is contained in:
Michael Natterer
2009-07-15 16:19:32 +02:00
parent 4da5ed3a8b
commit 997111bf0a
38 changed files with 66 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/actions/gradient-editor-commands.c
View File

@ -483,7 +483,8 @@ gradient_editor_replicate_cmd_callback (GtkAction *action,
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
vbox);
gtk_widget_show (vbox);
/* Instructions */
@ -585,7 +586,8 @@ gradient_editor_split_uniformly_cmd_callback (GtkAction *action,
/* The main vbox */
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
vbox);
gtk_widget_show (vbox);
/* Instructions */

2
app/dialogs/about-dialog.c
View File

@ -146,7 +146,7 @@ about_dialog_create (GimpContext *context)
dialog);
/* kids, don't try this at home! */
container = GTK_DIALOG (widget)->vbox;
container = gtk_dialog_get_content_area (GTK_DIALOG (widget));
children = gtk_container_get_children (GTK_CONTAINER (container));
if (GTK_IS_VBOX (children->data))

3
app/dialogs/channel-options-dialog.c
View File

@ -124,7 +124,8 @@ channel_options_dialog_new (GimpImage *image,
hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox), hbox);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (options->dialog))),
hbox);
gtk_widget_show (hbox);
vbox = gtk_vbox_new (FALSE, 6);

2
app/dialogs/convert-dialog.c
View File

@ -158,7 +158,7 @@ convert_dialog_new (GimpImage *image,
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox),
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))),
main_vbox);
gtk_widget_show (main_vbox);

3
app/dialogs/fade-dialog.c
View File

@ -141,7 +141,8 @@ fade_dialog_new (GimpImage *image,
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
main_vbox);
gtk_widget_show (main_vbox);
table = gtk_table_new (3, 3, FALSE);

2
app/dialogs/file-open-location-dialog.c
View File

@ -90,7 +90,7 @@ file_open_location_dialog_new (Gimp *gimp)
hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);

2
app/dialogs/grid-dialog.c
View File

@ -108,7 +108,7 @@ grid_dialog_new (GimpImage *image,
editor = gimp_grid_editor_new (grid, context, xres, yres);
gtk_container_set_border_width (GTK_CONTAINER (editor), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox),
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
editor);
gtk_widget_show (editor);

3
app/dialogs/image-merge-layers-dialog.c
View File

@ -85,7 +85,8 @@ image_merge_layers_dialog_new (GimpImage *image,
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox), vbox);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))),
vbox);
gtk_widget_show (vbox);
frame = gimp_int_radio_group_new (TRUE, _("Final, Merged Layer should be:"),

2
app/dialogs/image-new-dialog.c
View File

@ -122,7 +122,7 @@ image_new_dialog_new (GimpContext *context)
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog->dialog)->vbox),
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))),
main_vbox, TRUE, TRUE, 0);
gtk_widget_show (main_vbox);

4
app/dialogs/image-properties-dialog.c
View File

@ -74,8 +74,8 @@ image_properties_dialog_new (GimpImage *image,
NULL);
notebook = gtk_notebook_new ();
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), notebook,
FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
notebook, FALSE, FALSE, 0);
gtk_widget_show (notebook);
view = gimp_image_prop_view_new (image);

3
app/dialogs/keyboard-shortcuts-dialog.c
View File

@ -61,7 +61,8 @@ keyboard_shortcuts_dialog_new (Gimp *gimp)
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
vbox);
gtk_widget_show (vbox);
editor = gimp_action_editor_new (gimp_ui_managers_from_name ("<Image>")->data,

3
app/dialogs/layer-add-mask-dialog.c
View File

@ -102,7 +102,8 @@ layer_add_mask_dialog_new (GimpLayer *layer,
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox), vbox);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))),
vbox);
gtk_widget_show (vbox);
frame =

2
app/dialogs/layer-options-dialog.c
View File

@ -109,7 +109,7 @@ layer_options_dialog_new (GimpImage *image,
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox),
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (options->dialog))),
vbox);
gtk_widget_show (vbox);

3
app/dialogs/module-dialog.c
View File

@ -143,7 +143,8 @@ module_dialog_new (Gimp *gimp)
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (shell)->vbox), vbox);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (shell))),
vbox);
gtk_widget_show (vbox);
dialog->hint = gimp_hint_box_new (_("You will have to restart GIMP "

2
app/dialogs/offset-dialog.c
View File

@ -144,7 +144,7 @@ offset_dialog_new (GimpDrawable *drawable,
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox),
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))),
main_vbox);
gtk_widget_show (main_vbox);

2
app/dialogs/palette-import-dialog.c
View File

@ -189,7 +189,7 @@ palette_import_dialog_new (GimpContext *context)
main_hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox),
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))),
main_hbox);
gtk_widget_show (main_hbox);

3
app/dialogs/preferences-dialog.c
View File

@ -1437,7 +1437,8 @@ prefs_dialog_new (Gimp *gimp,
/* The main hbox */
hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
hbox);
gtk_widget_show (hbox);
/* The categories tree */

2
app/dialogs/print-size-dialog.c
View File

@ -137,7 +137,7 @@ print_size_dialog_new (GimpImage *image,
frame = gimp_frame_new (_("Print Size"));
gtk_container_set_border_width (GTK_CONTAINER (frame), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
frame, FALSE, FALSE, 0);
gtk_widget_show (frame);

3
app/dialogs/resize-dialog.c
View File

@ -184,7 +184,8 @@ resize_dialog_new (GimpViewable *viewable,
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
main_vbox);
gtk_widget_show (main_vbox);
frame = gimp_frame_new (text);

3
app/dialogs/resolution-calibrate-dialog.c
View File

@ -92,7 +92,8 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
table = gtk_table_new (4, 4, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
table);
gtk_widget_show (table);
if (pixbuf)

3
app/dialogs/scale-dialog.c
View File

@ -162,7 +162,8 @@ scale_dialog_new (GimpViewable *viewable,
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
vbox);
gtk_widget_show (vbox);
frame = gimp_frame_new (text);

3
app/dialogs/stroke-dialog.c
View File

@ -123,7 +123,8 @@ stroke_dialog_new (GimpItem *item,
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
main_vbox);
gtk_widget_show (main_vbox);
radio_box = gimp_prop_enum_radio_box_new (G_OBJECT (options), "method",

3
app/dialogs/template-options-dialog.c
View File

@ -103,7 +103,8 @@ template_options_dialog_new (GimpTemplate *template,
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox), vbox);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (options->dialog))),
vbox);
gtk_widget_show (vbox);
options->editor = gimp_template_editor_new (template, options->gimp, TRUE);

2
app/dialogs/tips-dialog.c
View File

@ -156,7 +156,7 @@ tips_dialog_create (Gimp *gimp)
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tips_dialog)->vbox),
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tips_dialog))),
vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);

4
app/dialogs/user-install-dialog.c
View File

@ -97,8 +97,8 @@ user_install_dialog_new (GimpUserInstall *install)
frame = gimp_frame_new (_("Installation Log"));
gtk_container_set_border_width (GTK_CONTAINER (frame), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame,
TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
scrolled = gtk_scrolled_window_new (NULL, NULL);

3
app/dialogs/vectors-options-dialog.c
View File

@ -101,7 +101,8 @@ vectors_options_dialog_new (GimpImage *image,
hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox), hbox);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (options->dialog))),
hbox);
gtk_widget_show (hbox);
vbox = gtk_vbox_new (FALSE, 6);

3
app/display/gimpdisplayshell-filter-dialog.c
View File

@ -116,7 +116,8 @@ gimp_display_shell_filter_dialog_new (GimpDisplayShell *shell)
editor = gimp_color_display_editor_new (shell->filter_stack);
gtk_container_set_border_width (GTK_CONTAINER (editor), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (cdd->dialog)->vbox), editor);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (cdd->dialog))),
editor);
gtk_widget_show (editor);
return cdd->dialog;

2
app/display/gimpdisplayshell-scale-dialog.c
View File

@ -147,7 +147,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell)
gtk_container_set_border_width (GTK_CONTAINER (table), 12);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (shell->scale_dialog)->vbox),
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (shell->scale_dialog))),
table);
gtk_widget_show (table);

3
app/gui/gui.c
View File

@ -171,7 +171,8 @@ gui_abort (const gchar *abort_message)
gimp_message_box_set_text (GIMP_MESSAGE_BOX (box), "%s", abort_message);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), box);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
box);
gtk_widget_show (box);
gimp_dialog_run (GIMP_DIALOG (dialog));

4
app/tools/gimpcolorpickertool.c
View File

@ -334,8 +334,8 @@ gimp_color_picker_tool_info_create (GimpColorPickerTool *picker_tool)
hbox = gtk_hbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (picker_tool->dialog)->vbox), hbox,
FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (picker_tool->dialog))),
hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
picker_tool->color_frame1 = gimp_color_frame_new ();

3
app/tools/gimpimagemaptool.c
View File

@ -304,7 +304,8 @@ gimp_image_map_tool_initialize (GimpTool *tool,
image_map_tool->main_vbox = vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (shell)->vbox), vbox);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (shell))),
vbox);
if (klass->settings_name)
gimp_image_map_tool_add_settings_gui (image_map_tool);

3
app/tools/gimpmeasuretool.c
View File

@ -1006,7 +1006,8 @@ gimp_measure_tool_dialog_new (GimpMeasureTool *measure)
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_container_set_border_width (GTK_CONTAINER (table), 6);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
table);
gtk_widget_show (table);

4
app/tools/gimpperspectivetool.c
View File

@ -114,8 +114,8 @@ gimp_perspective_tool_dialog (GimpTransformTool *tr_tool)
frame = gimp_frame_new (_("Transformation Matrix"));
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tr_tool->dialog)->vbox), frame,
FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tr_tool->dialog))),
frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
table = gtk_table_new (3, 3, FALSE);

4
app/tools/gimprotatetool.c
View File

@ -177,8 +177,8 @@ gimp_rotate_tool_dialog (GimpTransformTool *tr_tool)
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacing (GTK_TABLE (table), 1, 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tr_tool->dialog)->vbox), table,
FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tr_tool->dialog))),
table, FALSE, FALSE, 0);
gtk_widget_show (table);
button = gimp_spin_button_new (&rotate->angle_adj,

4
app/tools/gimpscaletool.c
View File

@ -170,8 +170,8 @@ gimp_scale_tool_prepare (GimpTransformTool *tr_tool,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (scale->box), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tr_tool->dialog)->vbox), scale->box,
FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tr_tool->dialog))),
scale->box, FALSE, FALSE, 0);
gtk_widget_show (scale->box);
g_signal_connect (scale->box, "notify",

4
app/tools/gimpsheartool.c
View File

@ -123,8 +123,8 @@ gimp_shear_tool_dialog (GimpTransformTool *tr_tool)
gtk_container_set_border_width (GTK_CONTAINER (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tr_tool->dialog)->vbox), table,
FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tr_tool->dialog))),
table, FALSE, FALSE, 0);
gtk_widget_show (table);
button = gimp_spin_button_new (&shear->x_adj,

2
app/tools/gimptexttool.c
View File

@ -2376,7 +2376,7 @@ gimp_text_tool_confirm_dialog (GimpTextTool *text_tool)
vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);

3
libgimpwidgets/gimpunitmenu.c
View File

@ -606,7 +606,8 @@ gimp_unit_menu_create_selection (GimpUnitMenu *menu)
/* the main vbox */
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (menu->selection)->vbox), vbox);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (menu->selection))),
vbox);
gtk_widget_show (vbox);
/* the selection list */