app/gimage_cmds.c pdbgenned files
* app/gimage_cmds.c * app/guides_cmds.c: pdbgenned files * app/parasite_cmds.c: added image parasite cmds * app/gimpimage.h: capitalized ChannelType and MergeType enums, made HORIZONTAL_GUIDE and VERTICAL_GUIDE an enum * app/layer.h: made APPLY and DISCARD an enum * app/internal_procs.[ch]: finally pdbgenned * app/channels_dialog.c * app/fileops.c * app/gimpimage.c * app/layers_dialog.c: ChannelType, MergeType enum changes * app/commands.c: remove gimage_cmds.h #include * app/cursorutil.h: #include <gdk/gdktypes.h> * app/paint_funcs.h: cosmetic change for PDB help * app/brush_select_cmds.c * app/brushes_cmds.c * app/layer_cmds.c * app/tools_cmds.c: pdbgen updates * app/Makefile.am: removed gimage_cmds.h, added guides_cmds.c * plug-ins/Lighting/lighting_main.c * plug-ins/MapObject/mapobject_main.c * plug-ins/rcm/rcm.c * plug-ins/xbm/xbm.c: removed trailing ";" from MAIN () -Yosh
This commit is contained in:
@ -1901,7 +1901,7 @@ layers_dialog_merge_down_callback (GtkWidget *w, gpointer client_data)
|
||||
if (! (gimage = layersD->gimage))
|
||||
return;
|
||||
|
||||
gimp_image_merge_down (gimage, gimage->active_layer, ExpandAsNecessary);
|
||||
gimp_image_merge_down (gimage, gimage->active_layer, EXPAND_AS_NECESSARY);
|
||||
gdisplays_flush ();
|
||||
}
|
||||
|
||||
@ -3937,7 +3937,7 @@ expand_as_necessary_callback (GtkWidget *w,
|
||||
LayerMergeOptions *options;
|
||||
|
||||
options = (LayerMergeOptions *) client_data;
|
||||
options->merge_type = ExpandAsNecessary;
|
||||
options->merge_type = EXPAND_AS_NECESSARY;
|
||||
}
|
||||
|
||||
static void
|
||||
@ -3947,7 +3947,7 @@ clip_to_image_callback (GtkWidget *w,
|
||||
LayerMergeOptions *options;
|
||||
|
||||
options = (LayerMergeOptions *) client_data;
|
||||
options->merge_type = ClipToImage;
|
||||
options->merge_type = CLIP_TO_IMAGE;
|
||||
}
|
||||
|
||||
static void
|
||||
@ -3957,7 +3957,7 @@ clip_to_bottom_layer_callback (GtkWidget *w,
|
||||
LayerMergeOptions *options;
|
||||
|
||||
options = (LayerMergeOptions *) client_data;
|
||||
options->merge_type = ClipToBottomLayer;
|
||||
options->merge_type = CLIP_TO_BOTTOM_LAYER;
|
||||
}
|
||||
|
||||
void
|
||||
@ -3994,7 +3994,7 @@ layers_dialog_layer_merge_query (GImage *gimage,
|
||||
options = (LayerMergeOptions *) g_malloc (sizeof (LayerMergeOptions));
|
||||
options->gimage = gimage;
|
||||
options->merge_visible = merge_visible;
|
||||
options->merge_type = ExpandAsNecessary;
|
||||
options->merge_type = EXPAND_AS_NECESSARY;
|
||||
|
||||
/* the dialog */
|
||||
options->query_box = gtk_dialog_new ();
|
||||
|
||||
Reference in New Issue
Block a user