added GimpContext parameters and create the GimpView with that context.
2006-09-01 Michael Natterer <mitch@gimp.org> * app/widgets/gimpviewabledialog.[ch]: added GimpContext parameters and create the GimpView with that context. * app/widgets/gimpcolordialog.[ch] * app/dialogs/convert-dialog.[ch] * app/dialogs/desaturate-dialog.[ch] * app/dialogs/grid-dialog.[ch] * app/dialogs/image-properties-dialog.[ch] * app/dialogs/layer-add-mask-dialog.[ch] * app/dialogs/offset-dialog.[ch] * app/dialogs/print-size-dialog.[ch] * app/dialogs/resize-dialog.[ch] * app/dialogs/scale-dialog.[ch] * app/dialogs/stroke-dialog.[ch] * app/dialogs/template-options-dialog.[ch] * app/dialogs/vectors-options-dialog.[ch]: added GimpContext parameters here too and pass them to gimp_viewable_dialog_new(). * app/actions/colormap-editor-commands.c * app/actions/drawable-commands.c * app/actions/gradient-editor-commands.c * app/actions/image-commands.c * app/actions/layers-commands.c * app/actions/palette-editor-commands.c * app/actions/select-commands.c * app/actions/vectors-commands.c * app/actions/view-commands.c * app/dialogs/channel-options-dialog.c * app/dialogs/dialogs-constructors.c * app/dialogs/image-merge-layers-dialog.c * app/dialogs/image-scale-dialog.c * app/dialogs/layer-options-dialog.c * app/display/gimpdisplayshell-filter-dialog.c * app/display/gimpdisplayshell-scale.c * app/tools/gimpcolorpickertool.c * app/tools/gimpimagemaptool.c * app/tools/gimpmeasuretool.c * app/tools/gimptexttool.c * app/tools/gimptransformtool.c * app/tools/gimpvectortool.c * app/widgets/gimpcolorpanel.c * app/widgets/gimpcontrollereditor.c * app/widgets/gimpcontrollerlist.c * app/widgets/gimptoolbox-color-area.c: pass contexts to above dialog constructors.
This commit is contained in:
committed by
Michael Natterer
parent
0051a8599f
commit
a6dbb78dfa
@ -25,7 +25,7 @@
|
||||
|
||||
#include "dialogs-types.h"
|
||||
|
||||
#include "core/gimp.h"
|
||||
#include "core/gimpcontext.h"
|
||||
#include "core/gimpimage.h"
|
||||
#include "core/gimplayer.h"
|
||||
|
||||
@ -79,6 +79,7 @@ static void offset_center_clicked (GtkWidget *widget,
|
||||
|
||||
GtkWidget *
|
||||
resize_dialog_new (GimpViewable *viewable,
|
||||
GimpContext *context,
|
||||
const gchar *title,
|
||||
const gchar *role,
|
||||
GtkWidget *parent,
|
||||
@ -105,6 +106,7 @@ resize_dialog_new (GimpViewable *viewable,
|
||||
gdouble xres, yres;
|
||||
|
||||
g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), NULL);
|
||||
g_return_val_if_fail (context == NULL || GIMP_IS_CONTEXT (context), NULL);
|
||||
g_return_val_if_fail (callback != NULL, NULL);
|
||||
|
||||
if (GIMP_IS_IMAGE (viewable))
|
||||
@ -132,7 +134,7 @@ resize_dialog_new (GimpViewable *viewable,
|
||||
g_return_val_if_reached (NULL);
|
||||
}
|
||||
|
||||
dialog = gimp_viewable_dialog_new (viewable,
|
||||
dialog = gimp_viewable_dialog_new (viewable, context,
|
||||
title, role, GIMP_STOCK_RESIZE, title,
|
||||
parent,
|
||||
help_func, help_id,
|
||||
@ -260,8 +262,7 @@ resize_dialog_new (GimpViewable *viewable,
|
||||
gtk_widget_show (private->area);
|
||||
|
||||
gimp_viewable_get_preview_size (viewable, 200, FALSE, TRUE, &width, &height);
|
||||
pixbuf = gimp_viewable_get_pixbuf (viewable,
|
||||
gimp_get_user_context (image->gimp),
|
||||
pixbuf = gimp_viewable_get_pixbuf (viewable, context,
|
||||
width, height);
|
||||
|
||||
if (pixbuf)
|
||||
|
||||
Reference in New Issue
Block a user