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

remove enum GimpItemLinkedMask...

Browse Source 
2006-05-19  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpitem-linked.h: remove enum GimpItemLinkedMask...

	* app/core/core-enums.[ch]: ...and add it here as GimpItemTypeMask.
	Renamed enum GimpImageResizeLayers to GimpItemSet.

	* app/core/gimpitem-linked.[ch]
	* app/core/gimpimage-resize.[ch]
	* app/dialogs/resize-dialog.[ch]
	* app/actions/image-commands.c
	* app/actions/layers-commands.c
	* app/tools/gimpeditselectiontool.c: changed accordingly.
This commit is contained in:
Michael Natterer
2006-05-19 14:50:46 +00:00
committed by Michael Natterer
parent 36ea51a2bb
commit 42ff7f4920
12 changed files with 163 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,16 +45,16 @@ typedef struct _ResizeDialog ResizeDialog;
struct _ResizeDialog
{
GimpViewable *viewable;
gint old_width;
gint old_height;
GimpUnit old_unit;
GtkWidget *box;
GtkWidget *offset;
GtkWidget *area;
GimpImageResizeLayers resize_layers;
GimpResizeCallback callback;
gpointer user_data;
GimpViewable *viewable;
gint old_width;
gint old_height;
GimpUnit old_unit;
GtkWidget *box;
GtkWidget *offset;
GtkWidget *area;
GimpItemSet layer_set;
GimpResizeCallback callback;
gpointer user_data;
};
@ -154,13 +154,13 @@ resize_dialog_new (GimpViewable *viewable,
g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_free, private);
private->viewable = viewable;
private->old_width = width;
private->old_height = height;
private->old_unit = unit;
private->resize_layers = GIMP_IMAGE_RESIZE_LAYERS_NONE;
private->callback = callback;
private->user_data = user_data;
private->viewable = viewable;
private->old_width = width;
private->old_height = height;
private->old_unit = unit;
private->layer_set = GIMP_ITEM_SET_NONE;
private->callback = callback;
private->user_data = user_data;
gimp_image_get_resolution (image, &xres, &yres);
@ -290,16 +290,16 @@ resize_dialog_new (GimpViewable *viewable,
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
combo = gimp_enum_combo_box_new (GIMP_TYPE_IMAGE_RESIZE_LAYERS);
combo = gimp_enum_combo_box_new (GIMP_TYPE_ITEM_SET);
gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
gtk_widget_show (combo);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo),
private->resize_layers,
private->layer_set,
G_CALLBACK (gimp_int_combo_box_get_active),
&private->resize_layers);
&private->layer_set);
}
return dialog;
@ -335,7 +335,7 @@ resize_dialog_response (GtkWidget *dialog,
unit,
gimp_size_entry_get_refval (entry, 0),
gimp_size_entry_get_refval (entry, 1),
private->resize_layers,
private->layer_set,
private->user_data);
break;