From e805cb0cf4177ad11cde0119347ffe952e8797a2 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 15 Jul 2009 18:57:12 +0200 Subject: [PATCH] Use gtk_dialog_get_content_area() instead of dialog->vbox --- plug-ins/color-rotate/color-rotate-dialog.c | 4 ++-- plug-ins/common/alien-map.c | 3 ++- plug-ins/common/align-layers.c | 4 ++-- plug-ins/common/apply-canvas.c | 3 ++- plug-ins/common/blinds.c | 3 ++- plug-ins/common/blur-gauss-selective.c | 3 ++- plug-ins/common/blur-gauss.c | 3 ++- plug-ins/common/blur-motion.c | 3 ++- plug-ins/common/border-average.c | 3 ++- plug-ins/common/bump-map.c | 3 ++- plug-ins/common/cartoon.c | 3 ++- plug-ins/common/channel-mixer.c | 3 ++- plug-ins/common/checkerboard.c | 3 ++- plug-ins/common/cml-explorer.c | 8 ++++---- plug-ins/common/color-cube-analyze.c | 4 ++-- plug-ins/common/color-exchange.c | 3 ++- plug-ins/common/color-to-alpha.c | 3 ++- plug-ins/common/colorify.c | 3 ++- plug-ins/common/colormap-remap.c | 3 ++- plug-ins/common/compose.c | 3 ++- plug-ins/common/contrast-retinex.c | 3 ++- plug-ins/common/convolution-matrix.c | 3 ++- plug-ins/common/cubism.c | 3 ++- plug-ins/common/curve-bend.c | 3 ++- plug-ins/common/decompose.c | 4 ++-- plug-ins/common/deinterlace.c | 3 ++- plug-ins/common/depth-merge.c | 2 +- plug-ins/common/despeckle.c | 3 ++- plug-ins/common/destripe.c | 3 ++- plug-ins/common/diffraction.c | 4 ++-- plug-ins/common/displace.c | 3 ++- plug-ins/common/edge-dog.c | 3 ++- plug-ins/common/edge-neon.c | 3 ++- plug-ins/common/edge-sobel.c | 3 ++- plug-ins/common/edge.c | 3 ++- plug-ins/common/emboss.c | 3 ++- plug-ins/common/engrave.c | 3 ++- plug-ins/common/file-aa.c | 2 +- plug-ins/common/file-csource.c | 3 ++- plug-ins/common/file-gbr.c | 3 ++- plug-ins/common/file-gif-save.c | 3 ++- plug-ins/common/file-gih.c | 3 ++- plug-ins/common/file-html-table.c | 4 ++-- plug-ins/common/file-mng.c | 3 ++- plug-ins/common/file-pat.c | 3 ++- plug-ins/common/file-pdf.c | 3 ++- plug-ins/common/file-png.c | 2 +- plug-ins/common/file-pnm.c | 2 +- plug-ins/common/file-ps.c | 8 ++++---- plug-ins/common/file-psp.c | 2 +- plug-ins/common/file-raw.c | 7 ++++--- plug-ins/common/file-sunras.c | 2 +- plug-ins/common/file-svg.c | 4 ++-- plug-ins/common/file-tga.c | 2 +- plug-ins/common/file-tiff-load.c | 3 ++- plug-ins/common/file-tiff-save.c | 2 +- plug-ins/common/file-wmf.c | 4 ++-- plug-ins/common/file-xbm.c | 2 +- plug-ins/common/file-xmc.c | 2 +- plug-ins/common/file-xpm.c | 2 +- plug-ins/common/film.c | 3 ++- plug-ins/common/filter-pack.c | 3 ++- plug-ins/common/fractal-trace.c | 3 ++- plug-ins/common/gee-zoom.c | 2 +- plug-ins/common/gee.c | 2 +- plug-ins/common/grid.c | 3 ++- plug-ins/common/hot.c | 3 ++- plug-ins/common/illusion.c | 3 ++- plug-ins/common/iwarp.c | 4 ++-- plug-ins/common/jigsaw.c | 3 ++- plug-ins/common/lcms.c | 6 ++++-- plug-ins/common/lens-apply.c | 3 ++- plug-ins/common/lens-distortion.c | 3 ++- plug-ins/common/lens-flare.c | 3 ++- plug-ins/common/mail.c | 2 +- plug-ins/common/max-rgb.c | 3 ++- plug-ins/common/mosaic.c | 3 ++- plug-ins/common/newsprint.c | 3 ++- plug-ins/common/nl-filter.c | 3 ++- plug-ins/common/noise-hsv.c | 3 ++- plug-ins/common/noise-randomize.c | 3 ++- plug-ins/common/noise-rgb.c | 3 ++- plug-ins/common/noise-solid.c | 3 ++- plug-ins/common/noise-spread.c | 3 ++- plug-ins/common/nova.c | 3 ++- plug-ins/common/oilify.c | 3 ++- plug-ins/common/photocopy.c | 3 ++- plug-ins/common/pixelize.c | 3 ++- plug-ins/common/plasma.c | 3 ++- plug-ins/common/plugin-browser.c | 2 +- plug-ins/common/polar-coords.c | 3 ++- plug-ins/common/qbist.c | 4 ++-- plug-ins/common/red-eye-removal.c | 3 ++- plug-ins/common/ripple.c | 3 ++- plug-ins/common/sample-colorize.c | 2 +- plug-ins/common/screenshot.c | 4 ++-- plug-ins/common/sharpen.c | 3 ++- plug-ins/common/shift.c | 3 ++- plug-ins/common/sinus.c | 4 ++-- plug-ins/common/smooth-palette.c | 5 +++-- plug-ins/common/softglow.c | 3 ++- plug-ins/common/sparkle.c | 3 ++- plug-ins/common/sphere-designer.c | 3 ++- plug-ins/common/threshold-alpha.c | 3 ++- plug-ins/common/tile-glass.c | 3 ++- plug-ins/common/tile-paper.c | 3 ++- plug-ins/common/tile-small.c | 4 ++-- plug-ins/common/tile.c | 3 ++- plug-ins/common/unit-editor.c | 10 +++++----- plug-ins/common/unsharp-mask.c | 3 ++- plug-ins/common/value-propagate.c | 3 ++- plug-ins/common/van-gogh-lic.c | 3 ++- plug-ins/common/video.c | 3 ++- plug-ins/common/warp.c | 3 ++- plug-ins/common/waves.c | 3 ++- plug-ins/common/whirl-pinch.c | 3 ++- plug-ins/common/wind.c | 3 ++- plug-ins/file-bmp/bmp-write.c | 3 ++- plug-ins/file-fits/fits.c | 4 ++-- plug-ins/file-fli/fli-gimp.c | 8 ++++---- plug-ins/file-ico/ico-dialog.c | 4 ++-- plug-ins/file-jpeg/jpeg-exif.c | 2 +- plug-ins/file-jpeg/jpeg-save.c | 6 ++++-- plug-ins/file-sgi/sgi.c | 2 +- plug-ins/file-xjt/xjt.c | 3 ++- plug-ins/flame/flame.c | 8 ++++---- .../fractal-explorer/fractal-explorer-dialogs.c | 4 ++-- plug-ins/fractal-explorer/fractal-explorer.c | 4 ++-- plug-ins/gfig/gfig-dialog.c | 14 ++++++++------ plug-ins/gimpressionist/gimpressionist.c | 3 ++- plug-ins/gimpressionist/orientmap.c | 2 +- plug-ins/gimpressionist/presets.c | 3 ++- plug-ins/gimpressionist/sizemap.c | 3 ++- plug-ins/gradient-flare/gradient-flare.c | 8 ++++---- plug-ins/ifs-compose/ifs-compose.c | 12 ++++++------ plug-ins/imagemap/imap_default_dialog.c | 4 ++-- plug-ins/lighting/lighting-ui.c | 4 ++-- plug-ins/map-object/map-object-ui.c | 4 ++-- plug-ins/maze/maze-dialog.c | 2 +- plug-ins/metadata/interface.c | 4 ++-- plug-ins/pagecurl/pagecurl.c | 2 +- plug-ins/script-fu/script-fu-console.c | 4 ++-- plug-ins/script-fu/script-fu-interface.c | 2 +- plug-ins/script-fu/script-fu-server.c | 2 +- plug-ins/selection-to-path/selection-to-path.c | 3 ++- plug-ins/win-snap/winsnap.c | 3 ++- 146 files changed, 299 insertions(+), 202 deletions(-) diff --git a/plug-ins/color-rotate/color-rotate-dialog.c b/plug-ins/color-rotate/color-rotate-dialog.c index e23f563943..1817bdb562 100644 --- a/plug-ins/color-rotate/color-rotate-dialog.c +++ b/plug-ins/color-rotate/color-rotate-dialog.c @@ -675,8 +675,8 @@ color_rotate_dialog (void) /* H-Box */ 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), hbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (hbox), previews, TRUE, TRUE, 0); diff --git a/plug-ins/common/alien-map.c b/plug-ins/common/alien-map.c index 83c02536f7..ccd27ceb5f 100644 --- a/plug-ins/common/alien-map.c +++ b/plug-ins/common/alien-map.c @@ -407,7 +407,8 @@ alienmap2_dialog (void) 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); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/align-layers.c b/plug-ins/common/align-layers.c index 6daebd10b5..be11a7ac03 100644 --- a/plug-ins/common/align-layers.c +++ b/plug-ins/common/align-layers.c @@ -416,8 +416,8 @@ align_layers_dialog (void) 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), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); combo = gimp_int_combo_box_new (_("None"), H_NONE, diff --git a/plug-ins/common/apply-canvas.c b/plug-ins/common/apply-canvas.c index dc6f4614fa..f11db63e9e 100644 --- a/plug-ins/common/apply-canvas.c +++ b/plug-ins/common/apply-canvas.c @@ -1277,7 +1277,8 @@ struc_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c index a2aebdbffe..53d8d173e1 100644 --- a/plug-ins/common/blinds.c +++ b/plug-ins/common/blinds.c @@ -237,7 +237,8 @@ blinds_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_aspect_preview_new (drawable, NULL); diff --git a/plug-ins/common/blur-gauss-selective.c b/plug-ins/common/blur-gauss-selective.c index 74c87ef85a..aa32cbb476 100644 --- a/plug-ins/common/blur-gauss-selective.c +++ b/plug-ins/common/blur-gauss-selective.c @@ -246,7 +246,8 @@ sel_gauss_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/blur-gauss.c b/plug-ins/common/blur-gauss.c index 57f93c56b1..3a483f6dce 100644 --- a/plug-ins/common/blur-gauss.c +++ b/plug-ins/common/blur-gauss.c @@ -492,7 +492,8 @@ gauss_dialog (gint32 image_ID, 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); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/blur-motion.c b/plug-ins/common/blur-motion.c index 475aa84a4a..cfb4fff9f7 100644 --- a/plug-ins/common/blur-motion.c +++ b/plug-ins/common/blur-motion.c @@ -1026,7 +1026,8 @@ mblur_dialog (gint32 image_ID, 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); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/border-average.c b/plug-ins/common/border-average.c index 6e09c56ff0..66f4b85aae 100644 --- a/plug-ins/common/border-average.c +++ b/plug-ins/common/border-average.c @@ -365,7 +365,8 @@ borderaverage_dialog (gint32 image_ID, 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 (_("Border Size")); diff --git a/plug-ins/common/bump-map.c b/plug-ins/common/bump-map.c index ac05020eb8..99a29b0f21 100644 --- a/plug-ins/common/bump-map.c +++ b/plug-ins/common/bump-map.c @@ -780,7 +780,8 @@ bumpmap_dialog (void) paned = gtk_hpaned_new (); gtk_container_set_border_width (GTK_CONTAINER (paned), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), paned); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + paned); gtk_widget_show (paned); hbox = gtk_hbox_new (FALSE, 0); diff --git a/plug-ins/common/cartoon.c b/plug-ins/common/cartoon.c index 4c7caa94f3..d3069de204 100644 --- a/plug-ins/common/cartoon.c +++ b/plug-ins/common/cartoon.c @@ -825,7 +825,8 @@ cartoon_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/channel-mixer.c b/plug-ins/common/channel-mixer.c index a8f7bff959..374683d0d5 100644 --- a/plug-ins/common/channel-mixer.c +++ b/plug-ins/common/channel-mixer.c @@ -506,7 +506,8 @@ cm_dialog (CmParamsType *mix, 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); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/checkerboard.c b/plug-ins/common/checkerboard.c index 423a9ea4d8..72cff6af30 100644 --- a/plug-ins/common/checkerboard.c +++ b/plug-ins/common/checkerboard.c @@ -360,7 +360,8 @@ checkerboard_dialog (gint32 image_ID, 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); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/cml-explorer.c b/plug-ins/common/cml-explorer.c index 919151cf06..e3f07134a8 100644 --- a/plug-ins/common/cml-explorer.c +++ b/plug-ins/common/cml-explorer.c @@ -1193,8 +1193,8 @@ CML_explorer_dialog (void) 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), hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); vbox = gtk_vbox_new (FALSE, 12); @@ -1826,8 +1826,8 @@ function_graph_new (GtkWidget *widget, frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + frame, FALSE, FALSE, 0); gtk_widget_show (frame); preview = gtk_drawing_area_new (); diff --git a/plug-ins/common/color-cube-analyze.c b/plug-ins/common/color-cube-analyze.c index 77bde0dffc..23f46deb58 100644 --- a/plug-ins/common/color-cube-analyze.c +++ b/plug-ins/common/color-cube-analyze.c @@ -364,8 +364,8 @@ doDialog (void) 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), vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); hbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); diff --git a/plug-ins/common/color-exchange.c b/plug-ins/common/color-exchange.c index dbec3aa84d..07f39ed714 100644 --- a/plug-ins/common/color-exchange.c +++ b/plug-ins/common/color-exchange.c @@ -302,7 +302,8 @@ exchange_dialog (GimpDrawable *drawable) /* do some boxes here */ 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 (_("Middle-Click Inside Preview to Pick \"From Color\"")); diff --git a/plug-ins/common/color-to-alpha.c b/plug-ins/common/color-to-alpha.c index cba41ca369..d3f3a73eff 100644 --- a/plug-ins/common/color-to-alpha.c +++ b/plug-ins/common/color-to-alpha.c @@ -391,7 +391,8 @@ color_to_alpha_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/colorify.c b/plug-ins/common/colorify.c index e850ef6cf4..3b5a0243db 100644 --- a/plug-ins/common/colorify.c +++ b/plug-ins/common/colorify.c @@ -269,7 +269,8 @@ colorify_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c index 810e07e621..9436a397cb 100644 --- a/plug-ins/common/colormap-remap.c +++ b/plug-ins/common/colormap-remap.c @@ -612,7 +612,8 @@ remap_dialog (gint32 image_ID, 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); cmap = gimp_image_get_colormap (image_ID, &ncols); diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c index 27dae2fea7..fa8b9123f9 100644 --- a/plug-ins/common/compose.c +++ b/plug-ins/common/compose.c @@ -1506,7 +1506,8 @@ compose_dialog (const gchar *compose_type, 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); /* Compose type combo */ diff --git a/plug-ins/common/contrast-retinex.c b/plug-ins/common/contrast-retinex.c index 12568e1290..669e91ad42 100644 --- a/plug-ins/common/contrast-retinex.c +++ b/plug-ins/common/contrast-retinex.c @@ -300,7 +300,8 @@ retinex_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/convolution-matrix.c b/plug-ins/common/convolution-matrix.c index 9b50106d70..5d4e94a37f 100644 --- a/plug-ins/common/convolution-matrix.c +++ b/plug-ins/common/convolution-matrix.c @@ -922,7 +922,8 @@ convolve_image_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/cubism.c b/plug-ins/common/cubism.c index 454e9f1429..face4febe4 100644 --- a/plug-ins/common/cubism.c +++ b/plug-ins/common/cubism.c @@ -282,7 +282,8 @@ cubism_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, &cvals.preview); diff --git a/plug-ins/common/curve-bend.c b/plug-ins/common/curve-bend.c index 217c0cbbf3..ee1b0dd5e7 100644 --- a/plug-ins/common/curve-bend.c +++ b/plug-ins/common/curve-bend.c @@ -1240,7 +1240,8 @@ bender_new_dialog (GimpDrawable *drawable) /* The main hbox */ main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (cd->shell)->vbox), main_hbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (cd->shell))), + main_hbox); gtk_widget_show (main_hbox); /* Left side column */ diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c index e6292841a0..d55e96459d 100644 --- a/plug-ins/common/decompose.c +++ b/plug-ins/common/decompose.c @@ -1495,8 +1495,8 @@ decompose_dialog (void) 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)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, TRUE, TRUE, 0); gtk_widget_show (main_vbox); frame = gimp_frame_new (_("Extract Channels")); diff --git a/plug-ins/common/deinterlace.c b/plug-ins/common/deinterlace.c index e57580a8b6..4a8942becd 100644 --- a/plug-ins/common/deinterlace.c +++ b/plug-ins/common/deinterlace.c @@ -336,7 +336,8 @@ deinterlace_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/depth-merge.c b/plug-ins/common/depth-merge.c index 0df53fcd70..1ba05fda6b 100644 --- a/plug-ins/common/depth-merge.c +++ b/plug-ins/common/depth-merge.c @@ -659,7 +659,7 @@ DepthMerge_dialog (DepthMerge *dm) vbox = gtk_vbox_new (FALSE, 12); 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); diff --git a/plug-ins/common/despeckle.c b/plug-ins/common/despeckle.c index 08765f0770..773d457ff3 100644 --- a/plug-ins/common/despeckle.c +++ b/plug-ins/common/despeckle.c @@ -439,7 +439,8 @@ despeckle_dialog (void) 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); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c index 4bd13aa9a9..dc5d6932f5 100644 --- a/plug-ins/common/destripe.c +++ b/plug-ins/common/destripe.c @@ -452,7 +452,8 @@ destripe_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/diffraction.c b/plug-ins/common/diffraction.c index 54fcbca932..3787a770c9 100644 --- a/plug-ins/common/diffraction.c +++ b/plug-ins/common/diffraction.c @@ -448,8 +448,8 @@ diffraction_dialog (void) 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), hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); /* Preview */ diff --git a/plug-ins/common/displace.c b/plug-ins/common/displace.c index 6031e9b695..b0dc342567 100644 --- a/plug-ins/common/displace.c +++ b/plug-ins/common/displace.c @@ -340,7 +340,8 @@ displace_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/edge-dog.c b/plug-ins/common/edge-dog.c index 7451837f5d..ba96cc7d81 100644 --- a/plug-ins/common/edge-dog.c +++ b/plug-ins/common/edge-dog.c @@ -314,7 +314,8 @@ dog_dialog (gint32 image_ID, 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); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/edge-neon.c b/plug-ins/common/edge-neon.c index a2584ae852..6e6632cf5c 100644 --- a/plug-ins/common/edge-neon.c +++ b/plug-ins/common/edge-neon.c @@ -709,7 +709,8 @@ neon_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/edge-sobel.c b/plug-ins/common/edge-sobel.c index f73123c72b..3d645b5ab6 100644 --- a/plug-ins/common/edge-sobel.c +++ b/plug-ins/common/edge-sobel.c @@ -245,7 +245,8 @@ sobel_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/edge.c b/plug-ins/common/edge.c index 77af9e437a..383092dd84 100644 --- a/plug-ins/common/edge.c +++ b/plug-ins/common/edge.c @@ -643,7 +643,8 @@ edge_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/emboss.c b/plug-ins/common/emboss.c index 64a1978271..c9ee2b6ac5 100644 --- a/plug-ins/common/emboss.c +++ b/plug-ins/common/emboss.c @@ -461,7 +461,8 @@ emboss_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/engrave.c b/plug-ins/common/engrave.c index f81505a609..eeaee31d80 100644 --- a/plug-ins/common/engrave.c +++ b/plug-ins/common/engrave.c @@ -223,7 +223,8 @@ engrave_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/file-aa.c b/plug-ins/common/file-aa.c index 57d344fa24..7a86991404 100644 --- a/plug-ins/common/file-aa.c +++ b/plug-ins/common/file-aa.c @@ -363,7 +363,7 @@ aa_dialog (gint selected) hbox = gtk_hbox_new (FALSE, 6); 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); diff --git a/plug-ins/common/file-csource.c b/plug-ins/common/file-csource.c index 507a081e8f..7f6a76ae94 100644 --- a/plug-ins/common/file-csource.c +++ b/plug-ins/common/file-csource.c @@ -674,7 +674,8 @@ run_save_dialog (Config *config) 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); table = gtk_table_new (2, 2, FALSE); diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c index 7d877cd9aa..4380ce5655 100644 --- a/plug-ins/common/file-gbr.c +++ b/plug-ins/common/file-gbr.c @@ -749,7 +749,8 @@ save_dialog (void) gtk_container_set_border_width (GTK_CONTAINER (table), 12); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, TRUE, TRUE, 0); gtk_widget_show (table); spinbutton = gimp_spin_button_new (&adj, diff --git a/plug-ins/common/file-gif-save.c b/plug-ins/common/file-gif-save.c index b63c5f714f..7162e497de 100644 --- a/plug-ins/common/file-gif-save.c +++ b/plug-ins/common/file-gif-save.c @@ -1023,7 +1023,8 @@ save_dialog (gint32 image_ID) 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); /* regular gif parameter settings */ diff --git a/plug-ins/common/file-gih.c b/plug-ins/common/file-gih.c index f4116ebd61..f33a67c79f 100644 --- a/plug-ins/common/file-gih.c +++ b/plug-ins/common/file-gih.c @@ -880,7 +880,8 @@ gih_save_dialog (gint32 image_ID) gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, TRUE, TRUE, 0); gtk_widget_show (table); /* diff --git a/plug-ins/common/file-html-table.c b/plug-ins/common/file-html-table.c index b3e278c791..e1c9bdbdbc 100644 --- a/plug-ins/common/file-html-table.c +++ b/plug-ins/common/file-html-table.c @@ -423,8 +423,8 @@ save_dialog (gint32 image_ID) 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)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, TRUE, TRUE, 0); if (gimp_image_width (image_ID) * gimp_image_height (image_ID) > 4096) { diff --git a/plug-ins/common/file-mng.c b/plug-ins/common/file-mng.c index e9d6a4e75a..f95bb337c6 100644 --- a/plug-ins/common/file-mng.c +++ b/plug-ins/common/file-mng.c @@ -1268,7 +1268,8 @@ mng_save_dialog (gint32 image_id) 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); frame = gimp_frame_new (_("MNG Options")); gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0); diff --git a/plug-ins/common/file-pat.c b/plug-ins/common/file-pat.c index a3f9fa3fde..b4d2977f75 100644 --- a/plug-ins/common/file-pat.c +++ b/plug-ins/common/file-pat.c @@ -544,7 +544,8 @@ save_dialog (void) table = gtk_table_new (1, 2, FALSE); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, TRUE, TRUE, 0); gtk_widget_show (table); entry = gtk_entry_new (); diff --git a/plug-ins/common/file-pdf.c b/plug-ins/common/file-pdf.c index 36fa328c1b..bebffcc2f2 100644 --- a/plug-ins/common/file-pdf.c +++ b/plug-ins/common/file-pdf.c @@ -832,7 +832,8 @@ load_dialog (PopplerDocument *doc, 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); /* Title */ diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c index 8ebde1a6e0..dad23335a8 100644 --- a/plug-ins/common/file-png.c +++ b/plug-ins/common/file-png.c @@ -1808,7 +1808,7 @@ save_dialog (gint32 image_ID, 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), 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))), table, TRUE, TRUE, 0); gtk_widget_show (table); diff --git a/plug-ins/common/file-pnm.c b/plug-ins/common/file-pnm.c index 64b5aa5043..e245258336 100644 --- a/plug-ins/common/file-pnm.c +++ b/plug-ins/common/file-pnm.c @@ -1207,7 +1207,7 @@ save_dialog (void) NULL); gtk_container_set_border_width (GTK_CONTAINER (frame), 6); - 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, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/file-ps.c b/plug-ins/common/file-ps.c index 083125ab93..ba84323b6c 100644 --- a/plug-ins/common/file-ps.c +++ b/plug-ins/common/file-ps.c @@ -3106,8 +3106,8 @@ load_dialog (const gchar *filename, 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)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, TRUE, TRUE, 0); gtk_widget_show (main_vbox); if (page_count > 1) @@ -3345,8 +3345,8 @@ save_dialog (void) /* Main hbox */ 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), hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, FALSE, FALSE, 0); main_vbox[0] = main_vbox[1] = NULL; for (j = 0; j < G_N_ELEMENTS (main_vbox); j++) diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c index 1e77b26205..a347fa5aab 100644 --- a/plug-ins/common/file-psp.c +++ b/plug-ins/common/file-psp.c @@ -664,7 +664,7 @@ save_dialog (void) NULL); 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, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/file-raw.c b/plug-ins/common/file-raw.c index 0d8b8cab92..b630a1239e 100644 --- a/plug-ins/common/file-raw.c +++ b/plug-ins/common/file-raw.c @@ -1065,7 +1065,8 @@ load_dialog (const gchar *filename) 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 = gtk_frame_new (NULL); @@ -1243,8 +1244,8 @@ save_dialog (const gchar *filename, 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)->vbox), main_vbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, FALSE, FALSE, 0); gtk_widget_show (main_vbox); frame = gimp_int_radio_group_new (TRUE, _("RGB Save Type"), diff --git a/plug-ins/common/file-sunras.c b/plug-ins/common/file-sunras.c index fd731e6b4a..560de91487 100644 --- a/plug-ins/common/file-sunras.c +++ b/plug-ins/common/file-sunras.c @@ -1652,7 +1652,7 @@ save_dialog (void) NULL); 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, TRUE, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/file-svg.c b/plug-ins/common/file-svg.c index b29bad9a35..7646ab4fac 100644 --- a/plug-ins/common/file-svg.c +++ b/plug-ins/common/file-svg.c @@ -746,8 +746,8 @@ load_dialog (const gchar *filename, 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), hbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); /* The SVG preview */ diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c index 86170609dc..736a76446d 100644 --- a/plug-ins/common/file-tga.c +++ b/plug-ins/common/file-tga.c @@ -1382,7 +1382,7 @@ save_dialog (void) vbox = gtk_vbox_new (FALSE, 12); 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, TRUE, TRUE, 0); gtk_widget_show (vbox); diff --git a/plug-ins/common/file-tiff-load.c b/plug-ins/common/file-tiff-load.c index 6060fbfccf..35af888c24 100644 --- a/plug-ins/common/file-tiff-load.c +++ b/plug-ins/common/file-tiff-load.c @@ -493,7 +493,8 @@ load_dialog (TIFF *tif, 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); /* Page Selector */ diff --git a/plug-ins/common/file-tiff-save.c b/plug-ins/common/file-tiff-save.c index 70d61a9dae..03b3d9fbc4 100644 --- a/plug-ins/common/file-tiff-save.c +++ b/plug-ins/common/file-tiff-save.c @@ -1076,7 +1076,7 @@ save_dialog (gboolean has_alpha, vbox = gtk_vbox_new (FALSE, 12); 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, TRUE, 0); /* compression */ diff --git a/plug-ins/common/file-wmf.c b/plug-ins/common/file-wmf.c index a97be67291..fe2ee46b43 100644 --- a/plug-ins/common/file-wmf.c +++ b/plug-ins/common/file-wmf.c @@ -516,8 +516,8 @@ load_dialog (const gchar *filename) 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), hbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); /* The WMF preview */ diff --git a/plug-ins/common/file-xbm.c b/plug-ins/common/file-xbm.c index 90d44ec1fc..81a00f2431 100644 --- a/plug-ins/common/file-xbm.c +++ b/plug-ins/common/file-xbm.c @@ -1201,7 +1201,7 @@ save_dialog (gint32 drawable_ID) /* parameter settings */ frame = gimp_frame_new (_("XBM Options")); 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, TRUE, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/file-xmc.c b/plug-ins/common/file-xmc.c index 811fb18872..1894bb7b7f 100644 --- a/plug-ins/common/file-xmc.c +++ b/plug-ins/common/file-xmc.c @@ -1076,7 +1076,7 @@ save_dialog (const gint32 image_ID, GimpParamRegion *hotspotRange) */ frame = gimp_frame_new (_("XMC Options")); 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, TRUE, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/file-xpm.c b/plug-ins/common/file-xpm.c index da8a398285..f6873cdd3c 100644 --- a/plug-ins/common/file-xpm.c +++ b/plug-ins/common/file-xpm.c @@ -820,7 +820,7 @@ save_dialog (void) table = gtk_table_new (1, 3, FALSE); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 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))), table, TRUE, TRUE, 0); gtk_widget_show (table); diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c index c82b9e3e0e..5515bc4ce4 100644 --- a/plug-ins/common/film.c +++ b/plug-ins/common/film.c @@ -1262,7 +1262,8 @@ film_dialog (gint32 image_ID) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + main_vbox); gtk_widget_show (main_vbox); notebook = gtk_notebook_new (); diff --git a/plug-ins/common/filter-pack.c b/plug-ins/common/filter-pack.c index 2bf820a780..2d7930489c 100644 --- a/plug-ins/common/filter-pack.c +++ b/plug-ins/common/filter-pack.c @@ -1241,7 +1241,8 @@ fp_dialog (void) 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), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + table, TRUE, TRUE, 0); gtk_widget_show (table); gtk_table_attach (GTK_TABLE (table), bna, 0, 2, 0, 1, diff --git a/plug-ins/common/fractal-trace.c b/plug-ins/common/fractal-trace.c index 48abb55c1c..2d07c42292 100644 --- a/plug-ins/common/fractal-trace.c +++ b/plug-ins/common/fractal-trace.c @@ -705,7 +705,8 @@ dialog_show (void) mainbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (mainbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), mainbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + mainbox); gtk_widget_show (mainbox); hbox = gtk_hbox_new (FALSE, 12); diff --git a/plug-ins/common/gee-zoom.c b/plug-ins/common/gee-zoom.c index 60eb28f85a..0fd61f0f1d 100644 --- a/plug-ins/common/gee-zoom.c +++ b/plug-ins/common/gee-zoom.c @@ -217,7 +217,7 @@ build_dialog (void) frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), frame, FALSE, FALSE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/gee.c b/plug-ins/common/gee.c index b40f699b22..2d66d2c1cc 100644 --- a/plug-ins/common/gee.c +++ b/plug-ins/common/gee.c @@ -178,7 +178,7 @@ build_dialog (void) frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); 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); diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c index 69b1c34f39..15a0c51ac9 100644 --- a/plug-ins/common/grid.c +++ b/plug-ins/common/grid.c @@ -653,7 +653,8 @@ dialog (gint32 image_ID, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/hot.c b/plug-ins/common/hot.c index 0feb0544b9..0f105f2b95 100644 --- a/plug-ins/common/hot.c +++ b/plug-ins/common/hot.c @@ -600,7 +600,8 @@ plugin_dialog (piArgs *argp) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), hbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); vbox = gtk_vbox_new (FALSE, 12); diff --git a/plug-ins/common/illusion.c b/plug-ins/common/illusion.c index 8988e45f6b..a63e22cc91 100644 --- a/plug-ins/common/illusion.c +++ b/plug-ins/common/illusion.c @@ -364,7 +364,8 @@ illusion_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/iwarp.c b/plug-ins/common/iwarp.c index 2f22edd843..2264beb8f6 100644 --- a/plug-ins/common/iwarp.c +++ b/plug-ins/common/iwarp.c @@ -1308,8 +1308,8 @@ iwarp_dialog (void) main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_hbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_hbox, TRUE, TRUE, 0); gtk_widget_show (main_hbox); vbox = gtk_vbox_new (FALSE, 12); diff --git a/plug-ins/common/jigsaw.c b/plug-ins/common/jigsaw.c index 4c9fa93d46..264168dde7 100644 --- a/plug-ins/common/jigsaw.c +++ b/plug-ins/common/jigsaw.c @@ -2430,7 +2430,8 @@ jigsaw_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_aspect_preview_new (drawable, NULL); diff --git a/plug-ins/common/lcms.c b/plug-ins/common/lcms.c index 1985a5840e..7bf2898240 100644 --- a/plug-ins/common/lcms.c +++ b/plug-ins/common/lcms.c @@ -1246,7 +1246,8 @@ lcms_icc_apply_dialog (gint32 image, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); label = lcms_icc_profile_src_label_new (image, src_profile); @@ -1471,7 +1472,8 @@ lcms_dialog (GimpColorConfig *config, 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 (_("Current Color Profile")); diff --git a/plug-ins/common/lens-apply.c b/plug-ins/common/lens-apply.c index cc31e83a03..773d0468b0 100644 --- a/plug-ins/common/lens-apply.c +++ b/plug-ins/common/lens-apply.c @@ -407,7 +407,8 @@ lens_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_aspect_preview_new (drawable, NULL); diff --git a/plug-ins/common/lens-distortion.c b/plug-ins/common/lens-distortion.c index dcaac58c15..ee82a151bc 100644 --- a/plug-ins/common/lens-distortion.c +++ b/plug-ins/common/lens-distortion.c @@ -497,7 +497,8 @@ lens_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/lens-flare.c b/plug-ins/common/lens-flare.c index 5ec7971daf..6f665fae42 100644 --- a/plug-ins/common/lens-flare.c +++ b/plug-ins/common/lens-flare.c @@ -320,7 +320,8 @@ flare_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/mail.c b/plug-ins/common/mail.c index e84a22c2c6..fc13a08e6a 100644 --- a/plug-ins/common/mail.c +++ b/plug-ins/common/mail.c @@ -422,7 +422,7 @@ save_dialog (void) 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 (dlg)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), main_vbox, TRUE, TRUE, 0); gtk_widget_show (main_vbox); diff --git a/plug-ins/common/max-rgb.c b/plug-ins/common/max-rgb.c index aa9dfc0200..c46a559544 100644 --- a/plug-ins/common/max-rgb.c +++ b/plug-ins/common/max-rgb.c @@ -273,7 +273,8 @@ max_rgb_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/mosaic.c b/plug-ins/common/mosaic.c index 6e13ed6ca1..88348cfc69 100644 --- a/plug-ins/common/mosaic.c +++ b/plug-ins/common/mosaic.c @@ -607,7 +607,8 @@ mosaic_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); /* A preview */ diff --git a/plug-ins/common/newsprint.c b/plug-ins/common/newsprint.c index 10021d5915..c4696095d1 100644 --- a/plug-ins/common/newsprint.c +++ b/plug-ins/common/newsprint.c @@ -1202,7 +1202,8 @@ newsprint_dialog (GimpDrawable *drawable) paned = gtk_hpaned_new (); gtk_container_set_border_width (GTK_CONTAINER (paned), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), paned); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + paned); gtk_widget_show (paned); hbox = gtk_hbox_new (FALSE, 0); diff --git a/plug-ins/common/nl-filter.c b/plug-ins/common/nl-filter.c index 668582c29a..7da64514db 100644 --- a/plug-ins/common/nl-filter.c +++ b/plug-ins/common/nl-filter.c @@ -1030,7 +1030,8 @@ nlfilter_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/noise-hsv.c b/plug-ins/common/noise-hsv.c index 059b232a57..ae28a789f2 100644 --- a/plug-ins/common/noise-hsv.c +++ b/plug-ins/common/noise-hsv.c @@ -378,7 +378,8 @@ scatter_hsv_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/noise-randomize.c b/plug-ins/common/noise-randomize.c index 61fdbabda9..6e7d0d6b28 100644 --- a/plug-ins/common/noise-randomize.c +++ b/plug-ins/common/noise-randomize.c @@ -746,7 +746,8 @@ randomize_dialog (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 (dlg)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/noise-rgb.c b/plug-ins/common/noise-rgb.c index e42b68e317..23daf7a559 100644 --- a/plug-ins/common/noise-rgb.c +++ b/plug-ins/common/noise-rgb.c @@ -464,7 +464,8 @@ noisify_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/noise-solid.c b/plug-ins/common/noise-solid.c index b8fdb58517..59c91542da 100644 --- a/plug-ins/common/noise-solid.c +++ b/plug-ins/common/noise-solid.c @@ -577,7 +577,8 @@ solid_noise_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_aspect_preview_new (drawable, NULL); diff --git a/plug-ins/common/noise-spread.c b/plug-ins/common/noise-spread.c index 74e70b7479..ae4b2344eb 100644 --- a/plug-ins/common/noise-spread.c +++ b/plug-ins/common/noise-spread.c @@ -358,7 +358,8 @@ spread_dialog (gint32 image_ID, 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); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/nova.c b/plug-ins/common/nova.c index b79787a5b3..54835eade2 100644 --- a/plug-ins/common/nova.c +++ b/plug-ins/common/nova.c @@ -318,7 +318,8 @@ nova_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/oilify.c b/plug-ins/common/oilify.c index eb20b933e9..9bb783b794 100644 --- a/plug-ins/common/oilify.c +++ b/plug-ins/common/oilify.c @@ -791,7 +791,8 @@ oilify_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/photocopy.c b/plug-ins/common/photocopy.c index dc712ceb55..1d11ca0226 100644 --- a/plug-ins/common/photocopy.c +++ b/plug-ins/common/photocopy.c @@ -853,7 +853,8 @@ photocopy_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/pixelize.c b/plug-ins/common/pixelize.c index f107a46a63..2d2074daa2 100644 --- a/plug-ins/common/pixelize.c +++ b/plug-ins/common/pixelize.c @@ -330,7 +330,8 @@ pixelize_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/plasma.c b/plug-ins/common/plasma.c index 4027400211..b93012d484 100644 --- a/plug-ins/common/plasma.c +++ b/plug-ins/common/plasma.c @@ -314,7 +314,8 @@ plasma_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_aspect_preview_new (drawable, NULL); diff --git a/plug-ins/common/plugin-browser.c b/plug-ins/common/plugin-browser.c index bbfc974f2c..c4a08e90d2 100644 --- a/plug-ins/common/plugin-browser.c +++ b/plug-ins/common/plugin-browser.c @@ -564,7 +564,7 @@ browser_dialog_new (void) browser->browser = gimp_browser_new (); gtk_container_set_border_width (GTK_CONTAINER (browser->browser), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (browser->dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (browser->dialog))), browser->browser); gtk_widget_show (browser->browser); diff --git a/plug-ins/common/polar-coords.c b/plug-ins/common/polar-coords.c index 4a60efe7fd..7593febf7b 100644 --- a/plug-ins/common/polar-coords.c +++ b/plug-ins/common/polar-coords.c @@ -607,7 +607,8 @@ polarize_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); /* Preview */ diff --git a/plug-ins/common/qbist.c b/plug-ins/common/qbist.c index 3136d6cbaa..611e97ef02 100644 --- a/plug-ins/common/qbist.c +++ b/plug-ins/common/qbist.c @@ -817,8 +817,8 @@ dialog_run (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, FALSE, FALSE, 0); gtk_widget_show (vbox); table = gtk_table_new (3, 3, FALSE); diff --git a/plug-ins/common/red-eye-removal.c b/plug-ins/common/red-eye-removal.c index c41d1cf255..31a113a79b 100644 --- a/plug-ins/common/red-eye-removal.c +++ b/plug-ins/common/red-eye-removal.c @@ -154,7 +154,8 @@ dialog (gint32 image_id, 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); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/ripple.c b/plug-ins/common/ripple.c index 1782107029..8066f2268b 100644 --- a/plug-ins/common/ripple.c +++ b/plug-ins/common/ripple.c @@ -498,7 +498,8 @@ ripple_dialog (GimpDrawable *drawable) /* The main vbox */ 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); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/sample-colorize.c b/plug-ins/common/sample-colorize.c index 640fe3eb4d..91b63315e2 100644 --- a/plug-ins/common/sample-colorize.c +++ b/plug-ins/common/sample-colorize.c @@ -1343,7 +1343,7 @@ smp_dialog (void) gtk_table_set_row_spacings (GTK_TABLE (table), 12); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 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))), table, TRUE, TRUE, 0); ty = 0; diff --git a/plug-ins/common/screenshot.c b/plug-ins/common/screenshot.c index 9d7d6ac7c0..475d95bfa3 100644 --- a/plug-ins/common/screenshot.c +++ b/plug-ins/common/screenshot.c @@ -1082,8 +1082,8 @@ shoot_dialog (GdkScreen **screen) 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)->vbox), main_vbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, FALSE, FALSE, 0); gtk_widget_show (main_vbox); /* Hints */ diff --git a/plug-ins/common/sharpen.c b/plug-ins/common/sharpen.c index bf3ef3ace1..2c14e431c5 100644 --- a/plug-ins/common/sharpen.c +++ b/plug-ins/common/sharpen.c @@ -490,7 +490,8 @@ sharpen_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/shift.c b/plug-ins/common/shift.c index 6be8d1e140..0361cea21e 100644 --- a/plug-ins/common/shift.c +++ b/plug-ins/common/shift.c @@ -369,7 +369,8 @@ shift_dialog (gint32 image_ID, 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); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/sinus.c b/plug-ins/common/sinus.c index d55273aecc..47a075c0b1 100644 --- a/plug-ins/common/sinus.c +++ b/plug-ins/common/sinus.c @@ -662,8 +662,8 @@ sinus_dialog (void) main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_hbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + main_hbox, TRUE, TRUE, 0); gtk_widget_show (main_hbox); /* Create preview */ diff --git a/plug-ins/common/smooth-palette.c b/plug-ins/common/smooth-palette.c index 8249169868..82fa274b98 100644 --- a/plug-ins/common/smooth-palette.c +++ b/plug-ins/common/smooth-palette.c @@ -442,8 +442,9 @@ dialog (GimpDrawable *drawable) 1, GIMP_MAX_IMAGE_SIZE, 1, GIMP_MAX_IMAGE_SIZE); gtk_container_set_border_width (GTK_CONTAINER (sizeentry), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), sizeentry, - FALSE, FALSE, 0); gtk_widget_show (sizeentry); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + sizeentry, FALSE, FALSE, 0); + gtk_widget_show (sizeentry); spinbutton = gimp_spin_button_new (&adj, config.ntries, 1, 1024, 1, 10, 0, 1, 0); diff --git a/plug-ins/common/softglow.c b/plug-ins/common/softglow.c index 951ee024d1..bc15b6555f 100644 --- a/plug-ins/common/softglow.c +++ b/plug-ins/common/softglow.c @@ -646,7 +646,8 @@ softglow_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c index f46a3b2f89..a544ab968c 100644 --- a/plug-ins/common/sparkle.c +++ b/plug-ins/common/sparkle.c @@ -351,7 +351,8 @@ sparkle_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/sphere-designer.c b/plug-ins/common/sphere-designer.c index 38d42d4e82..7578e201b1 100644 --- a/plug-ins/common/sphere-designer.c +++ b/plug-ins/common/sphere-designer.c @@ -2564,7 +2564,8 @@ makewindow (void) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (window)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (window))), + main_vbox); gtk_widget_show (main_vbox); main_hbox = gtk_hbox_new (FALSE, 12); diff --git a/plug-ins/common/threshold-alpha.c b/plug-ins/common/threshold-alpha.c index e4871c0053..5f0b82c936 100644 --- a/plug-ins/common/threshold-alpha.c +++ b/plug-ins/common/threshold-alpha.c @@ -262,7 +262,8 @@ threshold_alpha_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/tile-glass.c b/plug-ins/common/tile-glass.c index d395dc7dfc..ba47a01435 100644 --- a/plug-ins/common/tile-glass.c +++ b/plug-ins/common/tile-glass.c @@ -264,7 +264,8 @@ glasstile_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/tile-paper.c b/plug-ins/common/tile-paper.c index 56f45d60e8..189f0de693 100644 --- a/plug-ins/common/tile-paper.c +++ b/plug-ins/common/tile-paper.c @@ -257,7 +257,8 @@ open_dialog (void) 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)->vbox), main_hbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_hbox); gtk_widget_show (main_hbox); /* Left */ diff --git a/plug-ins/common/tile-small.c b/plug-ins/common/tile-small.c index 23df220635..e3cf44e6c0 100644 --- a/plug-ins/common/tile-small.c +++ b/plug-ins/common/tile-small.c @@ -378,8 +378,8 @@ tileit_dialog (void) 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 (dlg)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + main_vbox, TRUE, TRUE, 0); gtk_widget_show (main_vbox); hbox = gtk_hbox_new (FALSE, 12); diff --git a/plug-ins/common/tile.c b/plug-ins/common/tile.c index 0411b10c3d..08af0294f3 100644 --- a/plug-ins/common/tile.c +++ b/plug-ins/common/tile.c @@ -415,7 +415,8 @@ tile_dialog (gint32 image_ID, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); frame = gimp_frame_new (_("Tile to New Size")); diff --git a/plug-ins/common/unit-editor.c b/plug-ins/common/unit-editor.c index d5761bf769..dcda56f2c6 100644 --- a/plug-ins/common/unit-editor.c +++ b/plug-ins/common/unit-editor.c @@ -222,8 +222,8 @@ new_unit_dialog (GtkWidget *main_dialog, 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), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); entry = identifier_entry = gtk_entry_new (); @@ -449,8 +449,8 @@ unit_editor_dialog (void) -1, NULL); toolbar = gtk_ui_manager_get_widget (ui_manager, "/unit-editor-toolbar"); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), toolbar, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + toolbar, FALSE, FALSE, 0); gtk_widget_show (toolbar); scrolled_win = gtk_scrolled_window_new (NULL, NULL); @@ -460,7 +460,7 @@ unit_editor_dialog (void) GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scrolled_win); gtk_widget_show (scrolled_win); diff --git a/plug-ins/common/unsharp-mask.c b/plug-ins/common/unsharp-mask.c index a784eda93c..de23822d09 100644 --- a/plug-ins/common/unsharp-mask.c +++ b/plug-ins/common/unsharp-mask.c @@ -844,7 +844,8 @@ unsharp_mask_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/value-propagate.c b/plug-ins/common/value-propagate.c index b926a66f3b..cf27cc4a7f 100644 --- a/plug-ins/common/value-propagate.c +++ b/plug-ins/common/value-propagate.c @@ -1103,7 +1103,8 @@ vpropagate_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/van-gogh-lic.c b/plug-ins/common/van-gogh-lic.c index ee0e879d53..98353b1aff 100644 --- a/plug-ins/common/van-gogh-lic.c +++ b/plug-ins/common/van-gogh-lic.c @@ -655,7 +655,8 @@ create_main_dialog (void) 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); hbox = gtk_hbox_new (FALSE, 12); diff --git a/plug-ins/common/video.c b/plug-ins/common/video.c index e422de90d7..6b432e5d18 100644 --- a/plug-ins/common/video.c +++ b/plug-ins/common/video.c @@ -2031,7 +2031,8 @@ video_dialog (void) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), hbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); /* frame for the radio buttons */ diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c index 173c24d7fb..beaf28a927 100644 --- a/plug-ins/common/warp.c +++ b/plug-ins/common/warp.c @@ -390,7 +390,8 @@ warp_dialog (GimpDrawable *drawable) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); frame = gimp_frame_new (_("Basic Options")); diff --git a/plug-ins/common/waves.c b/plug-ins/common/waves.c index 9a67406eef..bdf12495b8 100644 --- a/plug-ins/common/waves.c +++ b/plug-ins/common/waves.c @@ -263,7 +263,8 @@ waves_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/whirl-pinch.c b/plug-ins/common/whirl-pinch.c index b2a3f19485..060a46ba41 100644 --- a/plug-ins/common/whirl-pinch.c +++ b/plug-ins/common/whirl-pinch.c @@ -542,7 +542,8 @@ whirl_pinch_dialog (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/wind.c b/plug-ins/common/wind.c index 3c17ad236e..2999615ff7 100644 --- a/plug-ins/common/wind.c +++ b/plug-ins/common/wind.c @@ -893,7 +893,8 @@ dialog_box (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)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/file-bmp/bmp-write.c b/plug-ins/file-bmp/bmp-write.c index cb5f8cde24..7e08cff5d3 100644 --- a/plug-ins/file-bmp/bmp-write.c +++ b/plug-ins/file-bmp/bmp-write.c @@ -809,7 +809,8 @@ save_dialog (gint channels) vbox_main = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox_main), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox_main); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox_main); gtk_widget_show (vbox_main); toggle = gtk_check_button_new_with_mnemonic (_("_Run-Length Encoded")); diff --git a/plug-ins/file-fits/fits.c b/plug-ins/file-fits/fits.c index 02c30b8d40..a4c92c3f26 100644 --- a/plug-ins/file-fits/fits.c +++ b/plug-ins/file-fits/fits.c @@ -1009,8 +1009,8 @@ load_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); frame = gimp_int_radio_group_new (TRUE, _("Replacement for undefined pixels"), diff --git a/plug-ins/file-fli/fli-gimp.c b/plug-ins/file-fli/fli-gimp.c index 86cc9cc046..2f4bbaf529 100644 --- a/plug-ins/file-fli/fli-gimp.c +++ b/plug-ins/file-fli/fli-gimp.c @@ -860,8 +860,8 @@ load_dialog (const gchar *filename) gtk_container_set_border_width (GTK_CONTAINER (table), 12); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); /* @@ -930,8 +930,8 @@ save_dialog (gint32 image_id) gtk_container_set_border_width (GTK_CONTAINER (table), 12); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); - gtk_box_pack_start (GTK_BOX(GTK_DIALOG (dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); /* diff --git a/plug-ins/file-ico/ico-dialog.c b/plug-ins/file-ico/ico-dialog.c index c1942756db..26c1690cc5 100644 --- a/plug-ins/file-ico/ico-dialog.c +++ b/plug-ins/file-ico/ico-dialog.c @@ -78,8 +78,8 @@ ico_dialog_new (IcoSaveInfo *info) 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)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, TRUE, TRUE, 0); gtk_widget_show (main_vbox); frame = gimp_frame_new (_("Icon Details")); diff --git a/plug-ins/file-jpeg/jpeg-exif.c b/plug-ins/file-jpeg/jpeg-exif.c index 5d66629674..3df5e5925c 100644 --- a/plug-ins/file-jpeg/jpeg-exif.c +++ b/plug-ins/file-jpeg/jpeg-exif.c @@ -307,7 +307,7 @@ jpeg_exif_rotate_query_dialog (gint32 image_ID) 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); diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c index dffd49ae25..35bebc0231 100644 --- a/plug-ins/file-jpeg/jpeg-save.c +++ b/plug-ins/file-jpeg/jpeg-save.c @@ -854,7 +854,8 @@ save_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); table = gtk_table_new (1, 3, FALSE); @@ -1179,7 +1180,8 @@ save_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); tabledefaults = gtk_table_new (1, 3, FALSE); diff --git a/plug-ins/file-sgi/sgi.c b/plug-ins/file-sgi/sgi.c index 952daa2ce0..5c9913b2fb 100644 --- a/plug-ins/file-sgi/sgi.c +++ b/plug-ins/file-sgi/sgi.c @@ -655,7 +655,7 @@ save_dialog (void) NULL); 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, TRUE, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/file-xjt/xjt.c b/plug-ins/file-xjt/xjt.c index 58c0383c22..22d3293dc2 100644 --- a/plug-ins/file-xjt/xjt.c +++ b/plug-ins/file-xjt/xjt.c @@ -882,7 +882,8 @@ save_dialog (void) 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), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + table, TRUE, TRUE, 0); gtk_widget_show (table); toggle = gtk_check_button_new_with_label (_("Optimize")); diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c index 0720647abc..f83eac26f4 100644 --- a/plug-ins/flame/flame.c +++ b/plug-ins/flame/flame.c @@ -662,8 +662,8 @@ edit_callback (GtkWidget *widget, 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 (edit_dialog)->vbox), main_vbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (edit_dialog))), + main_vbox, FALSE, FALSE, 0); frame = gimp_frame_new (_("Directions")); gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); @@ -982,8 +982,8 @@ flame_dialog (void) 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)->vbox), main_vbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, FALSE, FALSE, 0); gtk_widget_show (main_vbox); box = gtk_hbox_new (FALSE, 12); diff --git a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c index e0f33888b6..88ec2f0a88 100644 --- a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c +++ b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c @@ -585,8 +585,8 @@ explorer_dialog (void) top_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (top_hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), top_hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + top_hbox, FALSE, FALSE, 0); gtk_widget_show (top_hbox); left_vbox = gtk_vbox_new (FALSE, 12); diff --git a/plug-ins/fractal-explorer/fractal-explorer.c b/plug-ins/fractal-explorer/fractal-explorer.c index 770d9082ad..5d1eca21d1 100644 --- a/plug-ins/fractal-explorer/fractal-explorer.c +++ b/plug-ins/fractal-explorer/fractal-explorer.c @@ -1132,8 +1132,8 @@ fractalexplorer_rescan_list (GtkWidget *widget, patheditor = gimp_path_editor_new (_("Add FractalExplorer Path"), fractalexplorer_path); gtk_container_set_border_width (GTK_CONTAINER (patheditor), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), patheditor, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + patheditor, TRUE, TRUE, 0); gtk_widget_show (patheditor); if (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK) diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c index 43f5d86318..c27558bc3c 100644 --- a/plug-ins/gfig/gfig-dialog.c +++ b/plug-ins/gfig/gfig-dialog.c @@ -306,12 +306,12 @@ gfig_dialog (void) /* build the menu */ ui_manager = create_ui_manager (top_level_dlg); menubar = gtk_ui_manager_get_widget (ui_manager, "/ui/gfig-menubar"); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (top_level_dlg)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (top_level_dlg))), menubar, FALSE, FALSE, 0); gtk_widget_show (menubar); toolbar = gtk_ui_manager_get_widget (ui_manager, "/ui/gfig-toolbar"); gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (top_level_dlg)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (top_level_dlg))), toolbar, FALSE, FALSE, 0); gtk_widget_show (toolbar); @@ -320,8 +320,8 @@ gfig_dialog (void) /* Main box */ main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_box_pack_end (GTK_BOX (GTK_DIALOG (top_level_dlg)->vbox), main_hbox, - TRUE, TRUE, 0); + gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (top_level_dlg))), + main_hbox, TRUE, TRUE, 0); /* Preview itself */ gtk_box_pack_start (GTK_BOX (main_hbox), make_preview (), FALSE, FALSE, 0); @@ -1220,7 +1220,8 @@ gfig_prefs_action_callback (GtkAction *widget, main_vbox = gtk_vbox_new (FALSE, 0); 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); /* Put buttons in */ @@ -1368,7 +1369,8 @@ gfig_grid_action_callback (GtkAction *action, main_vbox = gtk_vbox_new (FALSE, 0); 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); hbox = gtk_hbox_new (FALSE, 6); diff --git a/plug-ins/gimpressionist/gimpressionist.c b/plug-ins/gimpressionist/gimpressionist.c index e4a3efe7ff..72771a4738 100644 --- a/plug-ins/gimpressionist/gimpressionist.c +++ b/plug-ins/gimpressionist/gimpressionist.c @@ -160,7 +160,8 @@ create_dialog (void) 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); preview_box = create_preview (); diff --git a/plug-ins/gimpressionist/orientmap.c b/plug-ins/gimpressionist/orientmap.c index 2f8bfc525c..f9491d702a 100644 --- a/plug-ins/gimpressionist/orientmap.c +++ b/plug-ins/gimpressionist/orientmap.c @@ -547,7 +547,7 @@ create_orientmap_dialog (GtkWidget *parent) table1 = gtk_table_new (2, 5, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table1), 6); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (orient_map_window)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (orient_map_window))), table1); gtk_widget_show (table1); diff --git a/plug-ins/gimpressionist/presets.c b/plug-ins/gimpressionist/presets.c index 2c795f14ae..746b0114ee 100644 --- a/plug-ins/gimpressionist/presets.c +++ b/plug-ins/gimpressionist/presets.c @@ -659,7 +659,8 @@ create_save_preset (GtkWidget *parent) box = gtk_vbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (box), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (window)->vbox), box); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (window))), + box); gtk_widget_show (box); label = gtk_label_new (_("Description:")); diff --git a/plug-ins/gimpressionist/sizemap.c b/plug-ins/gimpressionist/sizemap.c index 953023a5da..8fbec985a8 100644 --- a/plug-ins/gimpressionist/sizemap.c +++ b/plug-ins/gimpressionist/sizemap.c @@ -422,7 +422,8 @@ create_sizemap_dialog (GtkWidget *parent) table1 = gtk_table_new (2, 5, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table1), 6); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (smwindow)->vbox), table1); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (smwindow))), + table1); gtk_widget_show (table1); tmpw2 = tmpw = gtk_frame_new (_("Smvectors")); diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c index d06c6fb856..5273d8f97d 100644 --- a/plug-ins/gradient-flare/gradient-flare.c +++ b/plug-ins/gradient-flare/gradient-flare.c @@ -2373,8 +2373,8 @@ dlg_run (void) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (shell)->vbox), hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (shell))), + hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); /* @@ -3342,8 +3342,8 @@ ed_run (GtkWindow *parent, hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (shell)->vbox), hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (shell))), + hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); /* diff --git a/plug-ins/ifs-compose/ifs-compose.c b/plug-ins/ifs-compose/ifs-compose.c index 110de80a7c..f58194e4e9 100644 --- a/plug-ins/ifs-compose/ifs-compose.c +++ b/plug-ins/ifs-compose/ifs-compose.c @@ -801,15 +801,15 @@ ifs_compose_dialog (GimpDrawable *drawable) toolbar = gtk_ui_manager_get_widget (ifsDesign->ui_manager, "/ifs-compose-toolbar"); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), toolbar, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + toolbar, FALSE, FALSE, 0); gtk_widget_show (toolbar); /* The main vbox */ 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)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, TRUE, TRUE, 0); /* The design area */ @@ -1191,8 +1191,8 @@ ifs_options_dialog (GtkWidget *parent) gtk_container_set_border_width (GTK_CONTAINER (table), 12); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (ifsOptD->dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (ifsOptD->dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); label = gtk_label_new (_("Max. memory:")); diff --git a/plug-ins/imagemap/imap_default_dialog.c b/plug-ins/imagemap/imap_default_dialog.c index 13a31d9489..309fad37f3 100644 --- a/plug-ins/imagemap/imap_default_dialog.c +++ b/plug-ins/imagemap/imap_default_dialog.c @@ -121,8 +121,8 @@ make_default_dialog (const gchar *title) data->vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (data->vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (data->dialog)->vbox), data->vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (data->dialog))), + data->vbox, TRUE, TRUE, 0); gtk_widget_show (data->vbox); return data; diff --git a/plug-ins/lighting/lighting-ui.c b/plug-ins/lighting/lighting-ui.c index d2888ec9d8..67b0e85064 100644 --- a/plug-ins/lighting/lighting-ui.c +++ b/plug-ins/lighting/lighting-ui.c @@ -1033,8 +1033,8 @@ main_dialog (GimpDrawable *drawable) main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (appwin)->vbox), main_hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (appwin))), + main_hbox, FALSE, FALSE, 0); gtk_widget_show (main_hbox); /* Create the Preview */ diff --git a/plug-ins/map-object/map-object-ui.c b/plug-ins/map-object/map-object-ui.c index c6dde1d2f8..0066bf200d 100644 --- a/plug-ins/map-object/map-object-ui.c +++ b/plug-ins/map-object/map-object-ui.c @@ -1350,8 +1350,8 @@ main_dialog (GimpDrawable *drawable) main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (appwin)->vbox), main_hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (appwin))), + main_hbox, FALSE, FALSE, 0); gtk_widget_show (main_hbox); /* Create the Preview */ diff --git a/plug-ins/maze/maze-dialog.c b/plug-ins/maze/maze-dialog.c index 9ac8a8c572..d52d9de9d5 100644 --- a/plug-ins/maze/maze-dialog.c +++ b/plug-ins/maze/maze-dialog.c @@ -186,7 +186,7 @@ maze_dialog (void) vbox = gtk_vbox_new (FALSE, 12); 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); /* The maze size frame */ diff --git a/plug-ins/metadata/interface.c b/plug-ins/metadata/interface.c index e261bdb49a..12cf001d2f 100644 --- a/plug-ins/metadata/interface.c +++ b/plug-ins/metadata/interface.c @@ -682,8 +682,8 @@ metadata_dialog (gint32 image_ID, notebook = gtk_notebook_new (); gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_TOP); gtk_container_set_border_width (GTK_CONTAINER (notebook), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (mgui.dlg)->vbox), notebook, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (mgui.dlg))), + notebook, TRUE, TRUE, 0); gtk_widget_show (notebook); mgui.xmp_model = xmp_model; diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c index 0ad65b6a77..8db61dac1f 100644 --- a/plug-ins/pagecurl/pagecurl.c +++ b/plug-ins/pagecurl/pagecurl.c @@ -454,7 +454,7 @@ dialog (void) vbox = gtk_vbox_new (FALSE, 12); 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, TRUE, TRUE, 0); gtk_widget_show (vbox); diff --git a/plug-ins/script-fu/script-fu-console.c b/plug-ins/script-fu/script-fu-console.c index e31c34ba37..456a54b973 100644 --- a/plug-ins/script-fu/script-fu-console.c +++ b/plug-ins/script-fu/script-fu-console.c @@ -154,8 +154,8 @@ script_fu_console_interface (void) /* The main vbox */ vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (console.dialog)->vbox), vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (console.dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); /* The output text widget */ diff --git a/plug-ins/script-fu/script-fu-interface.c b/plug-ins/script-fu/script-fu-interface.c index 76d55041d3..b289f660f4 100644 --- a/plug-ins/script-fu/script-fu-interface.c +++ b/plug-ins/script-fu/script-fu-interface.c @@ -254,7 +254,7 @@ script_fu_interface (SFScript *script, vbox = gtk_vbox_new (FALSE, 12); 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, TRUE, TRUE, 0); gtk_widget_show (vbox); diff --git a/plug-ins/script-fu/script-fu-server.c b/plug-ins/script-fu/script-fu-server.c index 0957bed7e7..35585f6c5f 100644 --- a/plug-ins/script-fu/script-fu-server.c +++ b/plug-ins/script-fu/script-fu-server.c @@ -735,7 +735,7 @@ server_interface (void) 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), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), table, FALSE, FALSE, 0); /* The server port */ diff --git a/plug-ins/selection-to-path/selection-to-path.c b/plug-ins/selection-to-path/selection-to-path.c index b7ca2b50d7..09dde9f364 100644 --- a/plug-ins/selection-to-path/selection-to-path.c +++ b/plug-ins/selection-to-path/selection-to-path.c @@ -326,7 +326,8 @@ sel2path_dialog (SELVALS *sels) table = dialog_create_selection_area (sels); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), table); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + table); gtk_widget_show (table); gtk_widget_show (dlg); diff --git a/plug-ins/win-snap/winsnap.c b/plug-ins/win-snap/winsnap.c index a426a86307..2c92e82563 100644 --- a/plug-ins/win-snap/winsnap.c +++ b/plug-ins/win-snap/winsnap.c @@ -872,7 +872,8 @@ snap_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); winsnapintf.single_button =