0001-strict-sub.patch

diff --git a/examples/billboard b/examples/billboard
index 9099b77..1cb837c 100755
--- a/examples/billboard
+++ b/examples/billboard
@@ -131 +131 @@ EOF
-      MAKE_PALETTE, # palette type
+      MAKE_PALETTE(), # palette type
diff --git a/examples/blended2 b/examples/blended2
index 1e6e427..071e0d2 100755
--- a/examples/blended2
+++ b/examples/blended2
@@ -17 +17 @@ podregister {
-    my $bg_layer=$new_image->layer_new($drawable->width,$drawable->height,$image->layertype(1), "Background", 100, NORMAL_MODE);
+    my $bg_layer=$new_image->layer_new($drawable->width,$drawable->height,$image->layertype(1), "Background", 100, NORMAL_MODE());
@@ -19 +19 @@ podregister {
-    $bg_layer->drawable_fill(BACKGROUND_FILL);
+    $bg_layer->drawable_fill(BACKGROUND_FILL());
@@ -24 +24 @@ podregister {
-    $image->layertype(1), "Text -1-", 100, NORMAL_MODE
+    $image->layertype(1), "Text -1-", 100, NORMAL_MODE()
@@ -35,2 +35,2 @@ podregister {
-		   FG_BG_RGB_MODE,
-		   NORMAL_MODE,
+		   FG_BG_RGB_MODE(),
+		   NORMAL_MODE(),
@@ -51 +51 @@ podregister {
-  $text2_lay->edit_fill(BACKGROUND_FILL);
+  $text2_lay->edit_fill(BACKGROUND_FILL());
@@ -62 +62 @@ podregister {
-    $new_image->convert_indexed(0, MAKE_PALETTE, 256, 0, 0, "");
+    $new_image->convert_indexed(0, MAKE_PALETTE(), 256, 0, 0, "");
diff --git a/examples/blowinout b/examples/blowinout
index 0fee0ae..a8056ca 100755
--- a/examples/blowinout
+++ b/examples/blowinout
@@ -24 +24 @@ podregister {
-    100, NORMAL_MODE);
+    100, NORMAL_MODE());
diff --git a/examples/bricks b/examples/bricks
index 2197755..f05173a 100755
--- a/examples/bricks
+++ b/examples/bricks
@@ -79 +79 @@ podregister {
-  my $layerb = $image->image_add_new_layer(1,BACKGROUND_FILL,0);
+  my $layerb = $image->image_add_new_layer(1,BACKGROUND_FILL(),0);
diff --git a/examples/ditherize b/examples/ditherize
index 53fbc42..210504c 100755
--- a/examples/ditherize
+++ b/examples/ditherize
@@ -31 +31 @@ podregister {
-    "temporary layer", 100, NORMAL_MODE
+    "temporary layer", 100, NORMAL_MODE()
@@ -35 +35 @@ podregister {
-  $copy->convert_indexed ($dither_type, MAKE_PALETTE, $colours, 1, 1, "");
+  $copy->convert_indexed ($dither_type, MAKE_PALETTE(), $colours, 1, 1, "");
diff --git a/examples/dots b/examples/dots
index 6ab53a5..8feef17 100755
--- a/examples/dots
+++ b/examples/dots
@@ -36 +36 @@ podregister {
-  $opc->fill(FOREGROUND_FILL);
+  $opc->fill(FOREGROUND_FILL());
@@ -42 +42 @@ podregister {
-  $drawable->edit_fill(FOREGROUND_FILL);
+  $drawable->edit_fill(FOREGROUND_FILL());
diff --git a/examples/dust b/examples/dust
index c8929cb..917d104 100755
--- a/examples/dust
+++ b/examples/dust
@@ -65,3 +65,3 @@ podregister {
-  Gimp::Context->set_paint_mode(NORMAL_MODE);
-  $drawable = $image->add_new_layer (0, TRANSPARENT_FILL, 1);
-  $drawable->set_mode (DIFFERENCE_MODE);
+  Gimp::Context->set_paint_mode(NORMAL_MODE());
+  $drawable = $image->add_new_layer (0, TRANSPARENT_FILL(), 1);
+  $drawable->set_mode (DIFFERENCE_MODE());
diff --git a/examples/example-fu b/examples/example-fu
index 23ec4ac..a940ba1 100755
--- a/examples/example-fu
+++ b/examples/example-fu
@@ -15 +15 @@ podregister {
-  my $l = Gimp::Layer->new($img, $width, $height, RGB, __"Background", 100, NORMAL_MODE);
+  my $l = Gimp::Layer->new($img, $width, $height, RGB, __"Background", 100, NORMAL_MODE());
@@ -20 +20 @@ podregister {
-  fill $l BACKGROUND_FILL;
+  fill $l BACKGROUND_FILL();
diff --git a/examples/example-net b/examples/example-net
index ba3230a..3659c15 100755
--- a/examples/example-net
+++ b/examples/example-net
@@ -15 +15 @@ Gimp::on_net {
-  my $bg=$img->layer_new(30,20,RGB_IMAGE,"Background",100,NORMAL_MODE);
+  my $bg=$img->layer_new(30,20,RGB_IMAGE,"Background",100,NORMAL_MODE());
@@ -22 +22 @@ Gimp::on_net {
-     $bg->edit_fill(BACKGROUND_FILL);
+     $bg->edit_fill(BACKGROUND_FILL());
diff --git a/examples/example-no-fu b/examples/example-no-fu
index 27563d2..2c55a6a 100755
--- a/examples/example-no-fu
+++ b/examples/example-no-fu
@@ -798 +798 @@ sub do_fade {
-    $mask = $drawable->create_mask(ADD_ALPHA_MASK);
+    $mask = $drawable->create_mask(ADD_ALPHA_MASK());
@@ -814 +814 @@ sub do_fade {
-    FG_BG_RGB_MODE, NORMAL_MODE,
+    FG_BG_RGB_MODE(), NORMAL_MODE,
diff --git a/examples/fade-alpha b/examples/fade-alpha
index 89a92e0..56726cc 100755
--- a/examples/fade-alpha
+++ b/examples/fade-alpha
@@ -781 +781 @@ podregister {
-    $mask = $drawable->create_mask(ADD_ALPHA_MASK);
+    $mask = $drawable->create_mask(ADD_ALPHA_MASK());
@@ -795 +795 @@ podregister {
-    FG_BG_RGB_MODE, NORMAL_MODE,
+    FG_BG_RGB_MODE(), NORMAL_MODE(),
diff --git a/examples/gallery b/examples/gallery
index 02b1da5..ee686ef 100755
--- a/examples/gallery
+++ b/examples/gallery
@@ -69 +69 @@ podregister {
-      my $newlayer = $img->layer_new(200, 100, RGB_IMAGE, "newlayer", 100, NORMAL_MODE);
+      my $newlayer = $img->layer_new(200, 100, RGB_IMAGE, "newlayer", 100, NORMAL_MODE());
diff --git a/examples/gimp-make-img-map b/examples/gimp-make-img-map
index 298a653..4567cbd 100755
--- a/examples/gimp-make-img-map
+++ b/examples/gimp-make-img-map
@@ -158 +158 @@ sub decoration_drop_shadow {
-				RGB_IMAGE, "Tiled", 100, NORMAL_MODE);
+				RGB_IMAGE, "Tiled", 100, NORMAL_MODE());
@@ -160 +160 @@ sub decoration_drop_shadow {
-				   RGB_IMAGE, "Shadow", 50, NORMAL_MODE);
+				   RGB_IMAGE, "Shadow", 50, NORMAL_MODE());
@@ -162 +162 @@ sub decoration_drop_shadow {
-				       RGB_IMAGE, "Background", 100, NORMAL_MODE);
+				       RGB_IMAGE, "Background", 100, NORMAL_MODE());
@@ -178 +178 @@ sub decoration_drop_shadow {
-    $tiled_drw->edit_fill(BACKGROUND_FILL);
+    $tiled_drw->edit_fill(BACKGROUND_FILL());
@@ -181 +181 @@ sub decoration_drop_shadow {
-    $tiled_background->edit_fill(BACKGROUND_FILL);
+    $tiled_background->edit_fill(BACKGROUND_FILL());
@@ -185 +185 @@ sub decoration_drop_shadow {
-	$tiled_background->edit_bucket_fill(PATTERN_BUCKET_FILL,
+	$tiled_background->edit_bucket_fill(PATTERN_BUCKET_FILL(),
@@ -189 +189 @@ sub decoration_drop_shadow {
-    $tiled_shadow->edit_fill(BACKGROUND_FILL);
+    $tiled_shadow->edit_fill(BACKGROUND_FILL());
@@ -214 +214 @@ sub decoration_drop_shadow {
-	$tiled_drw_msk->edit_fill(BACKGROUND_FILL);
+	$tiled_drw_msk->edit_fill(BACKGROUND_FILL());
@@ -219 +219 @@ sub decoration_drop_shadow {
-	$tiled_shadow_msk->edit_fill(BACKGROUND_FILL);
+	$tiled_shadow_msk->edit_fill(BACKGROUND_FILL());
@@ -241 +241 @@ sub decoration_sunken_windows {
-				RGB_IMAGE, "Tiled", 100, NORMAL_MODE);
+				RGB_IMAGE, "Tiled", 100, NORMAL_MODE());
@@ -243 +243 @@ sub decoration_sunken_windows {
-				RGB_IMAGE, "Punched", 100, NORMAL_MODE);
+				RGB_IMAGE, "Punched", 100, NORMAL_MODE());
@@ -245 +245 @@ sub decoration_sunken_windows {
-				RGB_IMAGE, "Punch mask", 100, NORMAL_MODE);
+				RGB_IMAGE, "Punch mask", 100, NORMAL_MODE());
@@ -257 +257 @@ sub decoration_sunken_windows {
-    $tiled_drw->edit_fill(BACKGROUND_FILL);
+    $tiled_drw->edit_fill(BACKGROUND_FILL());
@@ -260 +260 @@ sub decoration_sunken_windows {
-    $tiled_punch_layer->edit_fill(BACKGROUND_FILL);
+    $tiled_punch_layer->edit_fill(BACKGROUND_FILL());
@@ -264 +264 @@ sub decoration_sunken_windows {
-	$tiled_punch_layer->edit_bucket_fill(PATTERN_BUCKET_FILL,
+	$tiled_punch_layer->edit_bucket_fill(PATTERN_BUCKET_FILL(),
@@ -268 +268 @@ sub decoration_sunken_windows {
-    $tiled_punch_stencil->edit_fill(BACKGROUND_FILL);
+    $tiled_punch_stencil->edit_fill(BACKGROUND_FILL());
@@ -295 +295 @@ sub decoration_sunken_windows {
-	$tiled_punch_stencil->edit_fill(BACKGROUND_FILL);
+	$tiled_punch_stencil->edit_fill(BACKGROUND_FILL());
diff --git a/examples/glowing_steel b/examples/glowing_steel
index ac8e50e..70adfcd 100755
--- a/examples/glowing_steel
+++ b/examples/glowing_steel
@@ -33 +33 @@ sub perl_fu_glowing_steel {
-				 "Background", 100, NORMAL_MODE);
+				 "Background", 100, NORMAL_MODE());
@@ -52 +52 @@ sub perl_fu_glowing_steel {
-  $backlayer->edit_bucket_fill(FG_BUCKET_FILL, NORMAL_MODE, 100, 0, 1, 0, 0);
+  $backlayer->edit_bucket_fill(FG_BUCKET_FILL(), NORMAL_MODE(), 100, 0, 1, 0, 0);
@@ -87 +87 @@ sub perl_fu_add_glow {
-    $image->width, $image->height, $type, "Glow layer", 100, NORMAL_MODE
+    $image->width, $image->height, $type, "Glow layer", 100, NORMAL_MODE()
@@ -103 +103 @@ sub perl_fu_add_glow {
-  $glow->edit_bucket_fill(FG_BUCKET_FILL, NORMAL_MODE, 100, 255, 0, 0, 0);
+  $glow->edit_bucket_fill(FG_BUCKET_FILL(), NORMAL_MODE(), 100, 255, 0, 0, 0);
@@ -143 +143 @@ sub perl_fu_brushed_metal {
-			     100, NORMAL_MODE);
+			     100, NORMAL_MODE());
@@ -202 +202 @@ sub perl_fu_highlight_edges {
-  $white->edit_bucket_fill(FG_BUCKET_FILL, NORMAL_MODE, 100, 255, 0, 0, 0);
+  $white->edit_bucket_fill(FG_BUCKET_FILL(), NORMAL_MODE(), 100, 255, 0, 0, 0);
@@ -204 +204 @@ sub perl_fu_highlight_edges {
-  $black->edit_bucket_fill(FG_BUCKET_FILL, NORMAL_MODE, 100, 255, 0, 0, 0);
+  $black->edit_bucket_fill(FG_BUCKET_FILL(), NORMAL_MODE(), 100, 255, 0, 0, 0);
diff --git a/examples/goldenmean b/examples/goldenmean
index 0c61298..4d1d20e 100755
--- a/examples/goldenmean
+++ b/examples/goldenmean
@@ -17 +17 @@ podregister {
-  my $layer = $img->layer_new($width, $height, RGB_IMAGE, "Layer 1", 100, NORMAL_MODE);
+  my $layer = $img->layer_new($width, $height, RGB_IMAGE, "Layer 1", 100, NORMAL_MODE());
@@ -20 +20 @@ podregister {
-  $layer->edit_fill(BACKGROUND_FILL);
+  $layer->edit_fill(BACKGROUND_FILL());
diff --git a/examples/iland b/examples/iland
index f08a2f1..dac58f7 100755
--- a/examples/iland
+++ b/examples/iland
@@ -27 +27 @@ podregister {
-    "L1", 100, NORMAL_MODE
+    "L1", 100, NORMAL_MODE()
@@ -36 +36 @@ podregister {
-  $newdrawable->fill(FOREGROUND_FILL);
+  $newdrawable->fill(FOREGROUND_FILL());
diff --git a/examples/image_tile b/examples/image_tile
index 1fc378c..1090fc8 100755
--- a/examples/image_tile
+++ b/examples/image_tile
@@ -116 +116 @@ podregister {
-  my $back = $dup->layer_new($imgwidth, $imgheight, RGB_IMAGE, "Target", 100, NORMAL_MODE);
+  my $back = $dup->layer_new($imgwidth, $imgheight, RGB_IMAGE, "Target", 100, NORMAL_MODE());
diff --git a/examples/innerbevel b/examples/innerbevel
index 72d5a8f..a453ac1 100755
--- a/examples/innerbevel
+++ b/examples/innerbevel
@@ -23 +23 @@ podregister {
-  $img->add_new_layer(0,TRANSPARENT_FILL);
+  $img->add_new_layer(0,TRANSPARENT_FILL());
@@ -31 +31 @@ podregister {
-  $layer->edit_blend(FG_BG_RGB_MODE, NORMAL_MODE, GRADIENT_LINEAR, 100, 0, REPEAT_NONE, 0, 0, 0, 3, 0.20, @pt1, @pt2);
+  $layer->edit_blend(FG_BG_RGB_MODE(), NORMAL_MODE(), GRADIENT_LINEAR, 100, 0, REPEAT_NONE, 0, 0, 0, 3, 0.20, @pt1, @pt2);
@@ -39 +39 @@ podregister {
-  $layer2->edit_fill(BACKGROUND_FILL);
+  $layer2->edit_fill(BACKGROUND_FILL());
diff --git a/examples/pixelmap b/examples/pixelmap
index 8d81137..d557503 100755
--- a/examples/pixelmap
+++ b/examples/pixelmap
@@ -84 +84 @@ register "pixelgen",
-   my $layer = new Gimp::Layer $image, $w, $h, $type, $layername, 100, NORMAL_MODE;
+   my $layer = new Gimp::Layer $image, $w, $h, $type, $layername, 100, NORMAL_MODE();
diff --git a/examples/prep4gif b/examples/prep4gif
index 36d150e..7f56bf2 100755
--- a/examples/prep4gif
+++ b/examples/prep4gif
@@ -26 +26 @@ podregister {
-  my $layer_mask = $foreground->create_mask(ADD_ALPHA_MASK);
+  my $layer_mask = $foreground->create_mask(ADD_ALPHA_MASK());
@@ -45 +45 @@ podregister {
-  $out->convert_indexed(FS_DITHER, MAKE_PALETTE, $colors, $dither, TRUE, "")
+  $out->convert_indexed(FS_DITHER(), MAKE_PALETTE(), $colors, $dither, TRUE, "")
diff --git a/examples/randomart1 b/examples/randomart1
index cfe78ef..9ae7dd3 100755
--- a/examples/randomart1
+++ b/examples/randomart1
@@ -20 +20 @@ podregister {
-		   "Random Art #1",100,NORMAL_MODE);
+		   "Random Art #1",100,NORMAL_MODE());
@@ -29 +29 @@ podregister {
-   $layer->fill(BACKGROUND_FILL);
+   $layer->fill(BACKGROUND_FILL());
@@ -54,2 +54,2 @@ podregister {
-      $layer->edit_blend (FG_BG_HSV_MODE,
-		     DIFFERENCE_MODE,
+      $layer->edit_blend (FG_BG_HSV_MODE(),
+		     DIFFERENCE_MODE(),
diff --git a/examples/randomblends b/examples/randomblends
index 2017437..602f39c 100755
--- a/examples/randomblends
+++ b/examples/randomblends
@@ -23,2 +23,2 @@ podregister {
-	$drawable->edit_blend(CUSTOM_MODE,
-                       DIFFERENCE_MODE,
+	$drawable->edit_blend(CUSTOM_MODE(),
+                       DIFFERENCE_MODE(),
@@ -58 +58 @@ random_blends - Perform N random blends
-A random approach to art, using the blend tool with DIFFERENCE_MODE.
+A random approach to art, using the blend tool with DIFFERENCE_MODE().
diff --git a/examples/scratches b/examples/scratches
index e2d3a8e..cfbbefd 100755
--- a/examples/scratches
+++ b/examples/scratches
@@ -17 +17 @@ sub new_scratchlayer {
-                                  "displace layer ($angle)", 100, NORMAL_MODE);
+                                  "displace layer ($angle)", 100, NORMAL_MODE());
@@ -19 +19 @@ sub new_scratchlayer {
-    $layer->fill (WHITE_FILL);
+    $layer->fill (WHITE_FILL());
diff --git a/examples/sethspin b/examples/sethspin
index d10e60b..13c8520 100755
--- a/examples/sethspin
+++ b/examples/sethspin
@@ -51 +51 @@ sub spin_layer { # the function for actually spinning the layer
-    $framelay->fill(BACKGROUND_FILL);
+    $framelay->fill(BACKGROUND_FILL());
@@ -96 +96 @@ podregister {
-  $img->convert_indexed(1,MAKE_PALETTE,255,0,1,"buffy") if $indexed;
+  $img->convert_indexed(1,MAKE_PALETTE(),255,0,1,"buffy") if $indexed;
diff --git a/examples/stampify b/examples/stampify
index df5567c..e9918da 100755
--- a/examples/stampify
+++ b/examples/stampify
@@ -12 +12 @@ podregister {
-  my $layer1 = $img2->layer_new($nw, $nh, RGBA_IMAGE, "Layer 1", 100, NORMAL_MODE);
+  my $layer1 = $img2->layer_new($nw, $nh, RGBA_IMAGE, "Layer 1", 100, NORMAL_MODE());
@@ -16 +16 @@ podregister {
-  $layer1->edit_fill(BACKGROUND_FILL);
+  $layer1->edit_fill(BACKGROUND_FILL());
@@ -35 +35 @@ podregister {
-  $layer1->edit_fill(BACKGROUND_FILL);
+  $layer1->edit_fill(BACKGROUND_FILL());
diff --git a/examples/stamps b/examples/stamps
index 18fb20a..0cfe04b 100755
--- a/examples/stamps
+++ b/examples/stamps
@@ -13 +13 @@ podregister {
-  my $layer = $img->layer_new($size, $size, RGB_IMAGE, "Layer 1", 100, NORMAL_MODE);
+  my $layer = $img->layer_new($size, $size, RGB_IMAGE, "Layer 1", 100, NORMAL_MODE());
@@ -16 +16 @@ podregister {
-  $layer->edit_fill(BACKGROUND_FILL);
+  $layer->edit_fill(BACKGROUND_FILL());
@@ -26 +26 @@ podregister {
-  $layer->edit_fill(BACKGROUND_FILL);
+  $layer->edit_fill(BACKGROUND_FILL());
diff --git a/examples/tex-to-float b/examples/tex-to-float
index 1c3d9eb..8423a57 100755
--- a/examples/tex-to-float
+++ b/examples/tex-to-float
@@ -115 +115 @@ sub grey_file_to_float {
-  gimp_edit_fill($grey_layer, BACKGROUND_FILL);
+  gimp_edit_fill($grey_layer, BACKGROUND_FILL());
@@ -122 +122 @@ sub grey_file_to_float {
-  gimp_edit_fill($floating_layer, BACKGROUND_FILL);
+  gimp_edit_fill($floating_layer, BACKGROUND_FILL());
diff --git a/examples/translogo b/examples/translogo
index 3e283b5..22994d1 100755
--- a/examples/translogo
+++ b/examples/translogo
@@ -21,2 +21,2 @@ podregister {
-  my $layer = $img->layer_new($drawable->width,$drawable->height,$image->layertype(1), __"Text", 100, NORMAL_MODE);
-  $layer->drawable_fill(TRANSPARENT_FILL);
+  my $layer = $img->layer_new($drawable->width,$drawable->height,$image->layertype(1), __"Text", 100, NORMAL_MODE());
+  $layer->drawable_fill(TRANSPARENT_FILL());
@@ -29 +29 @@ podregister {
-  $layer->edit_fill(BACKGROUND_FILL);
+  $layer->edit_fill(BACKGROUND_FILL());
@@ -33,2 +33,2 @@ podregister {
-  my $bump_lay = $img->layer_new($img->width,$img->height, RGBA_IMAGE, __"Bumpmap", 100, NORMAL_MODE);
-  $bump_lay->drawable_fill(BACKGROUND_FILL);
+  my $bump_lay = $img->layer_new($img->width,$img->height, RGBA_IMAGE, __"Bumpmap", 100, NORMAL_MODE());
+  $bump_lay->drawable_fill(BACKGROUND_FILL());
@@ -38 +38 @@ podregister {
-    $bump_lay->edit_bucket_fill(PATTERN_BUCKET_FILL, NORMAL_MODE, 100, 0, 0, 0, 0);
+    $bump_lay->edit_bucket_fill(PATTERN_BUCKET_FILL(), NORMAL_MODE(), 100, 0, 0, 0, 0);
@@ -41 +41 @@ podregister {
-    $bump_lay->edit_fill(BACKGROUND_FILL);
+    $bump_lay->edit_fill(BACKGROUND_FILL());
@@ -44 +44 @@ podregister {
-  my $pattern_mask = $bump_lay->create_mask(ADD_ALPHA_MASK);
+  my $pattern_mask = $bump_lay->create_mask(ADD_ALPHA_MASK());
@@ -53 +53 @@ podregister {
-  $img->convert_indexed(0, MAKE_PALETTE, 256, 0, 0, "");
+  $img->convert_indexed(0, MAKE_PALETTE(), 256, 0, 0, "");
diff --git a/examples/windify b/examples/windify
index 709368a..221f198 100755
--- a/examples/windify
+++ b/examples/windify
@@ -14 +14 @@ podregister {
-  my $windlayer = $out->layer_new($xsize,$ysize,RGB_IMAGE,"Windlayer",100,NORMAL_MODE);
+  my $windlayer = $out->layer_new($xsize,$ysize,RGB_IMAGE,"Windlayer",100,NORMAL_MODE());
diff --git a/examples/xachlego b/examples/xachlego
index 2654f86..a735b17 100755
--- a/examples/xachlego
+++ b/examples/xachlego
@@ -31 +31 @@ podregister {
-  $gridlayer->edit_fill(BACKGROUND_FILL);
+  $gridlayer->edit_fill(BACKGROUND_FILL());
@@ -53 +53 @@ podregister {
-  $cleangrid->edit_fill(BACKGROUND_FILL);
+  $cleangrid->edit_fill(BACKGROUND_FILL());
diff --git a/examples/xachshadow b/examples/xachshadow
index acbea60..eb3f9f8 100755
--- a/examples/xachshadow
+++ b/examples/xachshadow
@@ -20 +20 @@ podregister {
-  my $checkmask = $shadowlayer->create_mask(ADD_WHITE_MASK);
+  my $checkmask = $shadowlayer->create_mask(ADD_WHITE_MASK());
@@ -27 +27 @@ podregister {
-  $shadowlayer->fill(BACKGROUND_FILL);
+  $shadowlayer->fill(BACKGROUND_FILL());
@@ -36 +36 @@ podregister {
-  $gridlayer->edit_fill(BACKGROUND_FILL);
+  $gridlayer->edit_fill(BACKGROUND_FILL());
diff --git a/examples/xachvision b/examples/xachvision
index 64aa166..3d807b3 100755
--- a/examples/xachvision
+++ b/examples/xachvision
@@ -17,2 +17,2 @@ podregister {
-  $toplayer->edit_fill(BACKGROUND_FILL);
-  $toplayer->set_mode(COLOR_MODE);
+  $toplayer->edit_fill(BACKGROUND_FILL());
+  $toplayer->set_mode(COLOR_MODE());
@@ -20 +20 @@ podregister {
-  $drawable->edit_fill(BACKGROUND_FILL);
+  $drawable->edit_fill(BACKGROUND_FILL());
diff --git a/examples/yinyang b/examples/yinyang
index 24cc3f7..224ef4f 100755
--- a/examples/yinyang
+++ b/examples/yinyang
@@ -9 +9 @@ use warnings;
-my @BUCKET_ARGS = (FG_BUCKET_FILL,NORMAL_MODE,100,0,0,0,0);
+my @BUCKET_ARGS = (FG_BUCKET_FILL(),NORMAL_MODE(),100,0,0,0,0);
diff --git a/lib/Gimp/Fu.pm b/lib/Gimp/Fu.pm
index 67500e2..17b708a 100644
--- a/lib/Gimp/Fu.pm
+++ b/lib/Gimp/Fu.pm
@@ -434 +434 @@ sub save_image($$) {
-         $img->convert_indexed(2, Gimp::MAKE_PALETTE, 256, 1, 1, "");
+         $img->convert_indexed(2, Gimp::MAKE_PALETTE(), 256, 1, 1, "");
diff --git a/t/pdl.t b/t/pdl.t
index f35120b..55406c3 100644
--- a/t/pdl.t
+++ b/t/pdl.t
@@ -110 +110 @@ ok(
-  (my $l = $i->layer_new(10,10,RGB_IMAGE,"new layer",100,VALUE_MODE)),
+  (my $l = $i->layer_new(10,10,RGB_IMAGE,"new layer",100,VALUE_MODE())),
@@ -121 +121 @@ Gimp::Context->set_foreground($fgcolour);
-$l->fill(FOREGROUND_FILL);
+$l->fill(FOREGROUND_FILL());
@@ -154 +154 @@ eval $pdl_operations;
-$l->fill(FOREGROUND_FILL);
+$l->fill(FOREGROUND_FILL());
diff --git a/t/perlplugin.t b/t/perlplugin.t
index b70d8de..2449b72 100644
--- a/t/perlplugin.t
+++ b/t/perlplugin.t
@@ -150 +150 @@ ok(
-  (my $l0 = $i->layer_new(10,10,RGBA_IMAGE,"new layer",100,VALUE_MODE)),
+  (my $l0 = $i->layer_new(10,10,RGBA_IMAGE,"new layer",100,VALUE_MODE())),
diff --git a/t/run.t b/t/run.t
index 9463f4a..dbd7b64 100644
--- a/t/run.t
+++ b/t/run.t
@@ -14 +14 @@ ok(
-  (my $l = $i->layer_new(10,10,RGBA_IMAGE,"new layer",100,VALUE_MODE)),
+  (my $l = $i->layer_new(10,10,RGBA_IMAGE,"new layer",100,VALUE_MODE())),