GNOME.org
 

[gimp] libgimpbase, *: rename GimpFillType values: GIMP_FOO_FILL -> GIMP_FILL_FOO

commit 425748dab06215f35dff90b4479b7418141f1b0f
Author: Michael Natterer <mitch gimp org>
Date:   Tue Jun 3 01:11:32 2014 +0200

    libgimpbase, *: rename GimpFillType values: GIMP_FOO_FILL -> GIMP_FILL_FOO
    
    Change all users accordingly and add compat enum values and compat
    constants to script-fu and pygimp.

 app/actions/channels-commands.c     |    4 ++--
 app/actions/edit-actions.c          |    6 +++---
 app/actions/layers-commands.c       |    2 +-
 app/core/gimp-edit.c                |   12 ++++++------
 app/core/gimpdrawable.c             |   10 +++++-----
 app/core/gimpimage-new.c            |    2 +-
 app/core/gimptemplate.c             |    6 +++---
 app/dialogs/layer-options-dialog.c  |    4 ++--
 app/pdb/drawable-cmds.c             |    2 +-
 app/pdb/edit-cmds.c                 |   18 +++++++++---------
 app/tools/gimpbucketfilltool.c      |    6 +++---
 app/widgets/gimptemplateeditor.c    |    3 +--
 libgimpbase/gimpbaseenums.c         |   20 ++++++++++----------
 libgimpbase/gimpbaseenums.h         |   18 +++++++++++++-----
 plug-ins/common/film.c              |    2 +-
 plug-ins/common/hot.c               |    2 +-
 plug-ins/common/warp.c              |    4 ++--
 plug-ins/file-psd/psd-load.c        |    2 +-
 plug-ins/gfig/gfig-dialog.c         |    6 +++---
 plug-ins/pagecurl/pagecurl.c        |    2 +-
 plug-ins/pygimp/gimpenumsmodule.c   |   11 +++++++++++
 plug-ins/pygimp/pygimp-drawable.c   |    2 +-
 plug-ins/pygimp/pygimp-image.c      |    2 +-
 plug-ins/script-fu/scheme-wrapper.c |    6 ++++++
 tools/pdbgen/enums.pl               |   16 ++++++++--------
 tools/pdbgen/pdb/edit.pdb           |   16 ++++++++--------
 26 files changed, 104 insertions(+), 80 deletions(-)
---
diff --git a/app/actions/channels-commands.c b/app/actions/channels-commands.c
index d636b1f..48714f0 100644
--- a/app/actions/channels-commands.c
+++ b/app/actions/channels-commands.c
@@ -163,7 +163,7 @@ channels_new_last_vals_cmd_callback (GtkAction *action,
 
   gimp_drawable_fill_by_type (GIMP_DRAWABLE (new_channel),
                               action_data_get_context (data),
-                              GIMP_TRANSPARENT_FILL);
+                              GIMP_FILL_TRANSPARENT);
 
   gimp_image_add_channel (image, new_channel,
                           GIMP_IMAGE_ACTIVE_PARENT, -1, TRUE);
@@ -360,7 +360,7 @@ channels_new_channel_response (GtkWidget            *widget,
 
           gimp_drawable_fill_by_type (GIMP_DRAWABLE (new_channel),
                                       options->context,
-                                      GIMP_TRANSPARENT_FILL);
+                                      GIMP_FILL_TRANSPARENT);
         }
 
       gimp_image_add_channel (options->image, new_channel,
diff --git a/app/actions/edit-actions.c b/app/actions/edit-actions.c
index b90faca..a9b2ec5 100644
--- a/app/actions/edit-actions.c
+++ b/app/actions/edit-actions.c
@@ -194,19 +194,19 @@ static const GimpEnumActionEntry edit_fill_actions[] =
   { "edit-fill-fg", GIMP_STOCK_TOOL_BUCKET_FILL,
     NC_("edit-action", "Fill with _FG Color"), "<primary>comma",
     NC_("edit-action", "Fill the selection using the foreground color"),
-    GIMP_FOREGROUND_FILL, FALSE,
+    GIMP_FILL_FOREGROUND, FALSE,
     GIMP_HELP_EDIT_FILL_FG },
 
   { "edit-fill-bg", GIMP_STOCK_TOOL_BUCKET_FILL,
     NC_("edit-action", "Fill with B_G Color"), "<primary>period",
     NC_("edit-action", "Fill the selection using the background color"),
-    GIMP_BACKGROUND_FILL, FALSE,
+    GIMP_FILL_BACKGROUND, FALSE,
     GIMP_HELP_EDIT_FILL_BG },
 
   { "edit-fill-pattern", GIMP_STOCK_TOOL_BUCKET_FILL,
     NC_("edit-action", "Fill _with Pattern"), "<primary>semicolon",
     NC_("edit-action", "Fill the selection using the active pattern"),
-    GIMP_PATTERN_FILL, FALSE,
+    GIMP_FILL_PATTERN, FALSE,
     GIMP_HELP_EDIT_FILL_PATTERN }
 };
 
diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c
index 1ed7583..b5be1de 100644
--- a/app/actions/layers-commands.c
+++ b/app/actions/layers-commands.c
@@ -139,7 +139,7 @@ static gint   layers_mode_index            (GimpLayerModeEffects   layer_mode);
 
 /*  private variables  */
 
-static GimpFillType           layer_fill_type     = GIMP_TRANSPARENT_FILL;
+static GimpFillType           layer_fill_type     = GIMP_FILL_TRANSPARENT;
 static gchar                 *layer_name          = NULL;
 static GimpUnit               layer_resize_unit   = GIMP_UNIT_PIXEL;
 static GimpUnit               layer_scale_unit    = GIMP_UNIT_PIXEL;
diff --git a/app/core/gimp-edit.c b/app/core/gimp-edit.c
index f5d5a0f..2e13627 100644
--- a/app/core/gimp-edit.c
+++ b/app/core/gimp-edit.c
@@ -438,27 +438,27 @@ gimp_edit_fill (GimpImage            *image,
 
   switch (fill_type)
     {
-    case GIMP_FOREGROUND_FILL:
+    case GIMP_FILL_FOREGROUND:
       gimp_context_get_foreground (context, &color);
       undo_desc = C_("undo-type", "Fill with Foreground Color");
       break;
 
-    case GIMP_BACKGROUND_FILL:
+    case GIMP_FILL_BACKGROUND:
       gimp_context_get_background (context, &color);
       undo_desc = C_("undo-type", "Fill with Background Color");
       break;
 
-    case GIMP_WHITE_FILL:
+    case GIMP_FILL_WHITE:
       gimp_rgba_set (&color, 1.0, 1.0, 1.0, GIMP_OPACITY_OPAQUE);
       undo_desc = C_("undo-type", "Fill with White");
       break;
 
-    case GIMP_TRANSPARENT_FILL:
+    case GIMP_FILL_TRANSPARENT:
       gimp_context_get_background (context, &color);
       undo_desc = C_("undo-type", "Fill with Transparency");
       break;
 
-    case GIMP_PATTERN_FILL:
+    case GIMP_FILL_PATTERN:
       pattern = gimp_context_get_pattern (context);
       undo_desc = C_("undo-type", "Fill with Pattern");
       break;
@@ -466,7 +466,7 @@ gimp_edit_fill (GimpImage            *image,
     default:
       g_warning ("%s: unknown fill type", G_STRFUNC);
       return gimp_edit_fill (image, drawable,
-                             context, GIMP_BACKGROUND_FILL,
+                             context, GIMP_FILL_BACKGROUND,
                              GIMP_OPACITY_OPAQUE, GIMP_NORMAL_MODE);
     }
 
diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c
index 53a25be..1950470 100644
--- a/app/core/gimpdrawable.c
+++ b/app/core/gimpdrawable.c
@@ -1538,23 +1538,23 @@ gimp_drawable_fill_by_type (GimpDrawable *drawable,
 
   switch (fill_type)
     {
-    case GIMP_FOREGROUND_FILL:
+    case GIMP_FILL_FOREGROUND:
       gimp_context_get_foreground (context, &color);
       break;
 
-    case GIMP_BACKGROUND_FILL:
+    case GIMP_FILL_BACKGROUND:
       gimp_context_get_background (context, &color);
       break;
 
-    case GIMP_WHITE_FILL:
+    case GIMP_FILL_WHITE:
       gimp_rgba_set (&color, 1.0, 1.0, 1.0, GIMP_OPACITY_OPAQUE);
       break;
 
-    case GIMP_TRANSPARENT_FILL:
+    case GIMP_FILL_TRANSPARENT:
       gimp_rgba_set (&color, 0.0, 0.0, 0.0, GIMP_OPACITY_TRANSPARENT);
       break;
 
-    case GIMP_PATTERN_FILL:
+    case GIMP_FILL_PATTERN:
       pattern = gimp_context_get_pattern (context);
       break;
 
diff --git a/app/core/gimpimage-new.c b/app/core/gimpimage-new.c
index 7b2a6e6..b0a7a99 100644
--- a/app/core/gimpimage-new.c
+++ b/app/core/gimpimage-new.c
@@ -126,7 +126,7 @@ gimp_image_new_from_template (Gimp         *gimp,
   width  = gimp_image_get_width (image);
   height = gimp_image_get_height (image);
 
-  if (gimp_template_get_fill_type (template) == GIMP_TRANSPARENT_FILL)
+  if (gimp_template_get_fill_type (template) == GIMP_FILL_TRANSPARENT)
     has_alpha = TRUE;
   else
     has_alpha = FALSE;
diff --git a/app/core/gimptemplate.c b/app/core/gimptemplate.c
index bd92e2e..ab3a1ec 100644
--- a/app/core/gimptemplate.c
+++ b/app/core/gimptemplate.c
@@ -169,7 +169,7 @@ gimp_template_class_init (GimpTemplateClass *klass)
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_FILL_TYPE,
                                  "fill-type",
                                  NULL,
-                                 GIMP_TYPE_FILL_TYPE, GIMP_BACKGROUND_FILL,
+                                 GIMP_TYPE_FILL_TYPE, GIMP_FILL_BACKGROUND,
                                  GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_STRING (object_class, PROP_COMMENT,
@@ -328,7 +328,7 @@ gimp_template_notify (GObject    *object,
   /* the initial layer */
   format = gimp_babl_format (private->base_type,
                              private->precision,
-                             private->fill_type == GIMP_TRANSPARENT_FILL);
+                             private->fill_type == GIMP_FILL_TRANSPARENT);
   bytes = babl_format_get_bytes_per_pixel (format);
 
   /* the selection */
@@ -470,7 +470,7 @@ gimp_template_get_precision (GimpTemplate *template)
 GimpFillType
 gimp_template_get_fill_type (GimpTemplate *template)
 {
-  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), GIMP_BACKGROUND_FILL);
+  g_return_val_if_fail (GIMP_IS_TEMPLATE (template), GIMP_FILL_BACKGROUND);
 
   return GET_PRIVATE (template)->fill_type;
 }
diff --git a/app/dialogs/layer-options-dialog.c b/app/dialogs/layer-options-dialog.c
index b3c359a..050d342 100644
--- a/app/dialogs/layer-options-dialog.c
+++ b/app/dialogs/layer-options-dialog.c
@@ -200,8 +200,8 @@ layer_options_dialog_new (GimpImage    *image,
 
       /*  The radio frame  */
       frame = gimp_enum_radio_frame_new_with_range (GIMP_TYPE_FILL_TYPE,
-                                                    GIMP_FOREGROUND_FILL,
-                                                    GIMP_TRANSPARENT_FILL,
+                                                    GIMP_FILL_FOREGROUND,
+                                                    GIMP_FILL_TRANSPARENT,
                                                     gtk_label_new (_("Layer Fill Type")),
                                                     G_CALLBACK (gimp_radio_button_update),
                                                     &options->fill_type,
diff --git a/app/pdb/drawable-cmds.c b/app/pdb/drawable-cmds.c
index a771ba3..55027fd 100644
--- a/app/pdb/drawable-cmds.c
+++ b/app/pdb/drawable-cmds.c
@@ -1642,7 +1642,7 @@ register_drawable_procs (GimpPDB *pdb)
                                                   "fill type",
                                                   "The type of fill",
                                                   GIMP_TYPE_FILL_TYPE,
-                                                  GIMP_FOREGROUND_FILL,
+                                                  GIMP_FILL_FOREGROUND,
                                                   GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
diff --git a/app/pdb/edit-cmds.c b/app/pdb/edit-cmds.c
index 1edf040..472c6cb 100644
--- a/app/pdb/edit-cmds.c
+++ b/app/pdb/edit-cmds.c
@@ -604,20 +604,20 @@ edit_bucket_fill_invoker (GimpProcedure         *procedure,
 
           if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
             {
-              GimpFillType fill_type = GIMP_FOREGROUND_FILL;
+              GimpFillType fill_type = GIMP_FILL_FOREGROUND;
 
               switch (fill_mode)
                 {
                 case GIMP_BUCKET_FILL_FG:
-                  fill_type = GIMP_FOREGROUND_FILL;
+                  fill_type = GIMP_FILL_FOREGROUND;
                   break;
 
                 case GIMP_BUCKET_FILL_BG:
-                  fill_type = GIMP_BACKGROUND_FILL;
+                  fill_type = GIMP_FILL_BACKGROUND;
                   break;
 
                 case GIMP_BUCKET_FILL_PATTERN:
-                  fill_type = GIMP_PATTERN_FILL;
+                  fill_type = GIMP_FILL_PATTERN;
                   break;
                 }
 
@@ -684,20 +684,20 @@ edit_bucket_fill_full_invoker (GimpProcedure         *procedure,
 
           if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
             {
-              GimpFillType fill_type = GIMP_FOREGROUND_FILL;
+              GimpFillType fill_type = GIMP_FILL_FOREGROUND;
 
               switch (fill_mode)
                 {
                 case GIMP_BUCKET_FILL_FG:
-                  fill_type = GIMP_FOREGROUND_FILL;
+                  fill_type = GIMP_FILL_FOREGROUND;
                   break;
 
                 case GIMP_BUCKET_FILL_BG:
-                  fill_type = GIMP_BACKGROUND_FILL;
+                  fill_type = GIMP_FILL_BACKGROUND;
                   break;
 
                 case GIMP_BUCKET_FILL_PATTERN:
-                  fill_type = GIMP_PATTERN_FILL;
+                  fill_type = GIMP_FILL_PATTERN;
                   break;
                 }
 
@@ -1308,7 +1308,7 @@ register_edit_procs (GimpPDB *pdb)
                                                   "fill type",
                                                   "The type of fill",
                                                   GIMP_TYPE_FILL_TYPE,
-                                                  GIMP_FOREGROUND_FILL,
+                                                  GIMP_FILL_FOREGROUND,
                                                   GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
diff --git a/app/tools/gimpbucketfilltool.c b/app/tools/gimpbucketfilltool.c
index 99e4596..41a227a 100644
--- a/app/tools/gimpbucketfilltool.c
+++ b/app/tools/gimpbucketfilltool.c
@@ -196,13 +196,13 @@ gimp_bucket_fill_tool_button_release (GimpTool              *tool,
             {
             default:
             case GIMP_BUCKET_FILL_FG:
-              fill_type = GIMP_FOREGROUND_FILL;
+              fill_type = GIMP_FILL_FOREGROUND;
               break;
             case GIMP_BUCKET_FILL_BG:
-              fill_type = GIMP_BACKGROUND_FILL;
+              fill_type = GIMP_FILL_BACKGROUND;
               break;
             case GIMP_BUCKET_FILL_PATTERN:
-              fill_type = GIMP_PATTERN_FILL;
+              fill_type = GIMP_FILL_PATTERN;
               break;
             }
 
diff --git a/app/widgets/gimptemplateeditor.c b/app/widgets/gimptemplateeditor.c
index 83880e6..b758839 100644
--- a/app/widgets/gimptemplateeditor.c
+++ b/app/widgets/gimptemplateeditor.c
@@ -395,8 +395,7 @@ gimp_template_editor_constructed (GObject *object)
 
   combo = gimp_prop_enum_combo_box_new (G_OBJECT (template),
                                         "fill-type",
-                                        GIMP_FOREGROUND_FILL,
-                                        GIMP_PATTERN_FILL);
+                                        0, 0);
   gimp_table_attach_aligned (GTK_TABLE (table), 0, 4,
                              _("_Fill with:"), 0.0, 0.5,
                              combo, 1, FALSE);
diff --git a/libgimpbase/gimpbaseenums.c b/libgimpbase/gimpbaseenums.c
index 64e2de6..8b25d55 100644
--- a/libgimpbase/gimpbaseenums.c
+++ b/libgimpbase/gimpbaseenums.c
@@ -487,21 +487,21 @@ gimp_fill_type_get_type (void)
 {
   static const GEnumValue values[] =
   {
-    { GIMP_FOREGROUND_FILL, "GIMP_FOREGROUND_FILL", "foreground-fill" },
-    { GIMP_BACKGROUND_FILL, "GIMP_BACKGROUND_FILL", "background-fill" },
-    { GIMP_WHITE_FILL, "GIMP_WHITE_FILL", "white-fill" },
-    { GIMP_TRANSPARENT_FILL, "GIMP_TRANSPARENT_FILL", "transparent-fill" },
-    { GIMP_PATTERN_FILL, "GIMP_PATTERN_FILL", "pattern-fill" },
+    { GIMP_FILL_FOREGROUND, "GIMP_FILL_FOREGROUND", "foreground-fill" },
+    { GIMP_FILL_BACKGROUND, "GIMP_FILL_BACKGROUND", "background-fill" },
+    { GIMP_FILL_WHITE, "GIMP_FILL_WHITE", "white-fill" },
+    { GIMP_FILL_TRANSPARENT, "GIMP_FILL_TRANSPARENT", "transparent-fill" },
+    { GIMP_FILL_PATTERN, "GIMP_FILL_PATTERN", "pattern-fill" },
     { 0, NULL, NULL }
   };
 
   static const GimpEnumDesc descs[] =
   {
-    { GIMP_FOREGROUND_FILL, NC_("fill-type", "Foreground color"), NULL },
-    { GIMP_BACKGROUND_FILL, NC_("fill-type", "Background color"), NULL },
-    { GIMP_WHITE_FILL, NC_("fill-type", "White"), NULL },
-    { GIMP_TRANSPARENT_FILL, NC_("fill-type", "Transparency"), NULL },
-    { GIMP_PATTERN_FILL, NC_("fill-type", "Pattern"), NULL },
+    { GIMP_FILL_FOREGROUND, NC_("fill-type", "Foreground color"), NULL },
+    { GIMP_FILL_BACKGROUND, NC_("fill-type", "Background color"), NULL },
+    { GIMP_FILL_WHITE, NC_("fill-type", "White"), NULL },
+    { GIMP_FILL_TRANSPARENT, NC_("fill-type", "Transparency"), NULL },
+    { GIMP_FILL_PATTERN, NC_("fill-type", "Pattern"), NULL },
     { 0, NULL, NULL }
   };
 
diff --git a/libgimpbase/gimpbaseenums.h b/libgimpbase/gimpbaseenums.h
index e1060e8..9d2d258 100644
--- a/libgimpbase/gimpbaseenums.h
+++ b/libgimpbase/gimpbaseenums.h
@@ -260,11 +260,19 @@ GType gimp_fill_type_get_type (void) G_GNUC_CONST;
 
 typedef enum
 {
-  GIMP_FOREGROUND_FILL,   /*< desc="Foreground color" >*/
-  GIMP_BACKGROUND_FILL,   /*< desc="Background color" >*/
-  GIMP_WHITE_FILL,        /*< desc="White"            >*/
-  GIMP_TRANSPARENT_FILL,  /*< desc="Transparency"     >*/
-  GIMP_PATTERN_FILL       /*< desc="Pattern"          >*/
+  GIMP_FILL_FOREGROUND,  /*< nick=foreground-fill,  desc="Foreground color" >*/
+  GIMP_FILL_BACKGROUND,  /*< nick=background-fill,  desc="Background color" >*/
+  GIMP_FILL_WHITE,       /*< nick=white-fill,       desc="White"            >*/
+  GIMP_FILL_TRANSPARENT, /*< nick=transparent-fill, desc="Transparency"     >*/
+  GIMP_FILL_PATTERN,     /*< nick=pattern-fill,     desc="Pattern"          >*/
+
+#ifndef GIMP_DISABLE_DEPRECATED
+  GIMP_FOREGROUND_FILL  = GIMP_FILL_FOREGROUND,  /*< skip, pdb-skip >*/
+  GIMP_BACKGROUND_FILL  = GIMP_FILL_BACKGROUND,  /*< skip, pdb-skip >*/
+  GIMP_WHITE_FILL       = GIMP_FILL_WHITE,       /*< skip, pdb-skip >*/
+  GIMP_TRANSPARENT_FILL = GIMP_FILL_TRANSPARENT, /*< skip, pdb-skip >*/
+  GIMP_PATTERN_FILL     = GIMP_FILL_PATTERN      /*< skip, pdb-skip >*/
+#endif /* GIMP_DISABLE_DEPRECATED */
 } GimpFillType;
 
 
diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c
index dcf5792..e1ec793 100644
--- a/plug-ins/common/film.c
+++ b/plug-ins/common/film.c
@@ -426,7 +426,7 @@ film (void)
                                    &drawable_dst, &pixel_rgn_dst);
 
   /* Fill film background */
-  gimp_drawable_fill (layer_ID_dst, GIMP_BACKGROUND_FILL);
+  gimp_drawable_fill (layer_ID_dst, GIMP_FILL_BACKGROUND);
 
   /* Draw all the holes */
   hole_offset = film_height * filmvals.hole_offset;
diff --git a/plug-ins/common/hot.c b/plug-ins/common/hot.c
index e41150d..e63df4c 100644
--- a/plug-ins/common/hot.c
+++ b/plug-ins/common/hot.c
@@ -351,7 +351,7 @@ pluginCore (piArgs *argp)
       nl = gimp_layer_new (argp->image, name, width, height,
                            GIMP_RGBA_IMAGE, (gdouble)100, GIMP_NORMAL_MODE);
       ndrw = gimp_drawable_get (nl);
-      gimp_drawable_fill (nl, GIMP_TRANSPARENT_FILL);
+      gimp_drawable_fill (nl, GIMP_FILL_TRANSPARENT);
       gimp_image_insert_layer (argp->image, nl, -1, 0);
     }
 
diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c
index 83f7f37..b1eb57a 100644
--- a/plug-ins/common/warp.c
+++ b/plug-ins/common/warp.c
@@ -949,8 +949,8 @@ diff (GimpDrawable *drawable,
 
   gimp_image_insert_layer (new_image_id, xlayer_id, -1, 1);
   gimp_image_insert_layer (new_image_id, ylayer_id, -1, 1);
-  gimp_drawable_fill (xlayer_id, GIMP_BACKGROUND_FILL);
-  gimp_drawable_fill (ylayer_id, GIMP_BACKGROUND_FILL);
+  gimp_drawable_fill (xlayer_id, GIMP_FILL_BACKGROUND);
+  gimp_drawable_fill (ylayer_id, GIMP_FILL_BACKGROUND);
   gimp_image_set_active_layer (image_id, layer_active);
 
   dest_bytes = draw_xd->bpp;
diff --git a/plug-ins/file-psd/psd-load.c b/plug-ins/file-psd/psd-load.c
index d025a27..f0be2b3 100644
--- a/plug-ins/file-psd/psd-load.c
+++ b/plug-ins/file-psd/psd-load.c
@@ -1345,7 +1345,7 @@ add_layers (gint32     image_id,
                                          image_type, 0, GIMP_NORMAL_MODE);
               g_free (lyr_a[lidx]->name);
               gimp_image_insert_layer (image_id, layer_id, parent_group_id, -1);
-              gimp_drawable_fill (layer_id, GIMP_TRANSPARENT_FILL);
+              gimp_drawable_fill (layer_id, GIMP_FILL_TRANSPARENT);
               gimp_item_set_visible (layer_id, lyr_a[lidx]->layer_flags.visible);
               if (lyr_a[lidx]->id)
                 gimp_item_set_tattoo (layer_id, lyr_a[lidx]->id);
diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c
index 99faa3c..0ed0105 100644
--- a/plug-ins/gfig/gfig-dialog.c
+++ b/plug-ins/gfig/gfig-dialog.c
@@ -239,7 +239,7 @@ gfig_dialog (void)
 
   if (parasite)
     {
-      gimp_drawable_fill (gfig_context->drawable_id, GIMP_TRANSPARENT_FILL);
+      gimp_drawable_fill (gfig_context->drawable_id, GIMP_FILL_TRANSPARENT);
       gfig_context->using_new_layer = FALSE;
       gimp_parasite_free (parasite);
     }
@@ -248,7 +248,7 @@ gfig_dialog (void)
       newlayer = gimp_layer_new (gfig_context->image_id, "GFig",
                                  img_width, img_height,
                                  img_type, 100.0, GIMP_NORMAL_MODE);
-      gimp_drawable_fill (newlayer, GIMP_TRANSPARENT_FILL);
+      gimp_drawable_fill (newlayer, GIMP_FILL_TRANSPARENT);
       gimp_image_insert_layer (gfig_context->image_id, newlayer, -1, -1);
       gfig_context->drawable_id = newlayer;
       gfig_context->using_new_layer = TRUE;
@@ -1991,7 +1991,7 @@ gfig_paint_callback (void)
 
   objs = gfig_context->current_obj->obj_list;
 
-  gimp_drawable_fill (gfig_context->drawable_id, GIMP_TRANSPARENT_FILL);
+  gimp_drawable_fill (gfig_context->drawable_id, GIMP_FILL_TRANSPARENT);
 
   while (objs)
     {
diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c
index 9609529..af942d0 100644
--- a/plug-ins/pagecurl/pagecurl.c
+++ b/plug-ins/pagecurl/pagecurl.c
@@ -739,7 +739,7 @@ do_curl_effect (gint32 drawable_id)
   gimp_image_insert_layer (image_id, curl_layer->drawable_id,
                            gimp_item_get_parent (drawable_id),
                            drawable_position);
-  gimp_drawable_fill (curl_layer->drawable_id, GIMP_TRANSPARENT_FILL);
+  gimp_drawable_fill (curl_layer->drawable_id, GIMP_FILL_TRANSPARENT);
 
   gimp_drawable_offsets (drawable_id, &x1, &y1);
   gimp_layer_set_offsets (curl_layer->drawable_id, sel_x + x1, sel_y + y1);
diff --git a/plug-ins/pygimp/gimpenumsmodule.c b/plug-ins/pygimp/gimpenumsmodule.c
index 4869ec0..2a94251 100644
--- a/plug-ins/pygimp/gimpenumsmodule.c
+++ b/plug-ins/pygimp/gimpenumsmodule.c
@@ -130,6 +130,17 @@ add_compat_enums(PyObject *m)
     PyModule_AddIntConstant(m, "PATTERN_CLONE",
                            GIMP_CLONE_PATTERN);
 
+    PyModule_AddIntConstant(m, "FOREGROUND-FILL",
+                           GIMP_FILL_FOREGROUND);
+    PyModule_AddIntConstant(m, "BACKGROUND-FILL",
+                           GIMP_FILL_BACKGROUND);
+    PyModule_AddIntConstant(m, "WHITE-FILL",
+                           GIMP_FILL_WHITE);
+    PyModule_AddIntConstant(m, "TRANSPARENT-FILL",
+                           GIMP_FILL_TRANSPARENT);
+    PyModule_AddIntConstant(m, "PATTERN-FILL",
+                           GIMP_FILL_PATTERN);
+
     PyModule_AddIntConstant(m, "DODGE",
                            GIMP_DODGE_BURN_TYPE_DODGE);
     PyModule_AddIntConstant(m, "BURN",
diff --git a/plug-ins/pygimp/pygimp-drawable.c b/plug-ins/pygimp/pygimp-drawable.c
index 05f2d1e..ba11327 100644
--- a/plug-ins/pygimp/pygimp-drawable.c
+++ b/plug-ins/pygimp/pygimp-drawable.c
@@ -109,7 +109,7 @@ drw_free_shadow(PyGimpDrawable *self)
 static PyObject *
 drw_fill(PyGimpDrawable *self, PyObject *args, PyObject *kwargs)
 {
-    int fill = GIMP_FOREGROUND_FILL;
+    int fill = GIMP_FILL_FOREGROUND;
 
     static char *kwlist[] = { "fill", NULL };
 
diff --git a/plug-ins/pygimp/pygimp-image.c b/plug-ins/pygimp/pygimp-image.c
index 36389b2..f7784a5 100644
--- a/plug-ins/pygimp/pygimp-image.c
+++ b/plug-ins/pygimp/pygimp-image.c
@@ -167,7 +167,7 @@ img_new_layer(PyGimpImage *self, PyObject *args, PyObject *kwargs)
     }
 
     if (fill_mode == -1)
-        fill_mode = alpha ? GIMP_TRANSPARENT_FILL: GIMP_BACKGROUND_FILL;
+        fill_mode = alpha ? GIMP_FILL_TRANSPARENT: GIMP_FILL_BACKGROUND;
 
 
     layer_id = gimp_layer_new(self->ID, layer_name, width, height,
diff --git a/plug-ins/script-fu/scheme-wrapper.c b/plug-ins/script-fu/scheme-wrapper.c
index 47eee14..14fa9a3 100644
--- a/plug-ins/script-fu/scheme-wrapper.c
+++ b/plug-ins/script-fu/scheme-wrapper.c
@@ -156,6 +156,12 @@ static const NamedConstant const old_constants[] =
   { "IMAGE-CLONE",             GIMP_CLONE_IMAGE   },
   { "PATTERN-CLONE",           GIMP_CLONE_PATTERN },
 
+  { "FOREGROUND-FILL",         GIMP_FILL_FOREGROUND  },
+  { "BACKGROUND-FILL",         GIMP_FILL_BACKGROUND  },
+  { "WHITE-FILL",              GIMP_FILL_WHITE       },
+  { "TRANSPARENT-FILL",        GIMP_FILL_TRANSPARENT },
+  { "PATTERN-FILL",            GIMP_FILL_PATTERN     },
+
   { "DODGE",                   GIMP_DODGE_BURN_TYPE_DODGE },
   { "BURN",                    GIMP_DODGE_BURN_TYPE_BURN  },
 
diff --git a/tools/pdbgen/enums.pl b/tools/pdbgen/enums.pl
index a8b0cfa..85c5efc 100644
--- a/tools/pdbgen/enums.pl
+++ b/tools/pdbgen/enums.pl
@@ -146,14 +146,14 @@ package Gimp::CodeGen::enums;
     GimpFillType =>
        { contig => 1,
          header => 'libgimpbase/gimpbaseenums.h',
-         symbols => [ qw(GIMP_FOREGROUND_FILL GIMP_BACKGROUND_FILL
-                         GIMP_WHITE_FILL GIMP_TRANSPARENT_FILL
-                         GIMP_PATTERN_FILL) ],
-         mapping => { GIMP_FOREGROUND_FILL => '0',
-                      GIMP_BACKGROUND_FILL => '1',
-                      GIMP_WHITE_FILL => '2',
-                      GIMP_TRANSPARENT_FILL => '3',
-                      GIMP_PATTERN_FILL => '4' }
+         symbols => [ qw(GIMP_FILL_FOREGROUND GIMP_FILL_BACKGROUND
+                         GIMP_FILL_WHITE GIMP_FILL_TRANSPARENT
+                         GIMP_FILL_PATTERN) ],
+         mapping => { GIMP_FILL_FOREGROUND => '0',
+                      GIMP_FILL_BACKGROUND => '1',
+                      GIMP_FILL_WHITE => '2',
+                      GIMP_FILL_TRANSPARENT => '3',
+                      GIMP_FILL_PATTERN => '4' }
        },
     GimpForegroundExtractMode =>
        { contig => 1,
diff --git a/tools/pdbgen/pdb/edit.pdb b/tools/pdbgen/pdb/edit.pdb
index ad153a6..17cbcb8 100644
--- a/tools/pdbgen/pdb/edit.pdb
+++ b/tools/pdbgen/pdb/edit.pdb
@@ -640,20 +640,20 @@ HELP
 
       if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
         {
-          GimpFillType fill_type = GIMP_FOREGROUND_FILL;
+          GimpFillType fill_type = GIMP_FILL_FOREGROUND;
 
           switch (fill_mode)
             {
             case GIMP_BUCKET_FILL_FG:
-              fill_type = GIMP_FOREGROUND_FILL;
+              fill_type = GIMP_FILL_FOREGROUND;
               break;
 
             case GIMP_BUCKET_FILL_BG:
-              fill_type = GIMP_BACKGROUND_FILL;
+              fill_type = GIMP_FILL_BACKGROUND;
               break;
 
             case GIMP_BUCKET_FILL_PATTERN:
-              fill_type = GIMP_PATTERN_FILL;
+              fill_type = GIMP_FILL_PATTERN;
               break;
             }
 
@@ -748,20 +748,20 @@ HELP
 
       if (! gimp_channel_is_empty (gimp_image_get_mask (image)))
         {
-          GimpFillType fill_type = GIMP_FOREGROUND_FILL;
+          GimpFillType fill_type = GIMP_FILL_FOREGROUND;
 
           switch (fill_mode)
             {
             case GIMP_BUCKET_FILL_FG:
-              fill_type = GIMP_FOREGROUND_FILL;
+              fill_type = GIMP_FILL_FOREGROUND;
               break;
 
             case GIMP_BUCKET_FILL_BG:
-              fill_type = GIMP_BACKGROUND_FILL;
+              fill_type = GIMP_FILL_BACKGROUND;
               break;
 
             case GIMP_BUCKET_FILL_PATTERN:
-              fill_type = GIMP_PATTERN_FILL;
+              fill_type = GIMP_FILL_PATTERN;
               break;
             }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]