From cde309e45d2c56d282e29a1e754075a47cefae8d Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Wed, 28 Feb 2001 15:01:02 +0000 Subject: [PATCH] made it compile again --- ChangeLog | 15 +++++++++++++++ app/pdb/layer_cmds.c | 4 ++-- app/pdb/tools_cmds.c | 6 +++--- app/tools/crop.c | 15 ++++++++------- app/tools/gimpcroptool.c | 15 ++++++++------- libgimp/gimpenums.h | 4 +++- plug-ins/script-fu/script-fu-constants.c | 2 ++ tools/pdbgen/enums.pl | 11 ++++++++--- tools/pdbgen/pdb/misc_tools.pdb | 12 ++++++------ tools/pdbgen/pdb/paint_tools.pdb | 12 ++++++------ tools/pdbgen/pdb/tools.pdb | 12 ++++++------ tools/pdbgen/pdb/transform_tools.pdb | 12 ++++++------ 12 files changed, 73 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index 503ff4b1fa..9635b64015 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2001-02-28 Sven Neumann + + Please, do not change the files in app/pdb directly, they are + autogenerated. And, please, whatever you change, type make in + the toplevel srcdir, since pdbgen might decide it has to change + some more files because of your changes. + + * app/pdb/layer_cmds.c + * app/pdb/tools_cmds.c + * app/tools/crop.c + * libgimp/gimpenums.h + * plug-ins/script-fu/script-fu-constants.c + * tools/pdbgen/enums.pl + * tools/pdbgen/pdb/tools.pdb: made everything compile again + 2001-02-27 Jay Cox * app/appenums.h diff --git a/app/pdb/layer_cmds.c b/app/pdb/layer_cmds.c index 2a84fc51a1..4ece83c751 100644 --- a/app/pdb/layer_cmds.c +++ b/app/pdb/layer_cmds.c @@ -304,7 +304,7 @@ layer_create_mask_invoker (Argument *args) success = FALSE; mask_type = args[1].value.pdb_int; - if (mask_type < ADD_WHITE_MASK || mask_type > ADD_ALPHA_MASK) + if (mask_type < ADD_WHITE_MASK || mask_type > ADD_INV_SELECTION_MASK) success = FALSE; if (success) @@ -328,7 +328,7 @@ static ProcArg layer_create_mask_inargs[] = { PDB_INT32, "mask_type", - "The type of mask: { WHITE_MASK (0), BLACK_MASK (1), ALPHA_MASK (2) }" + "The type of mask: { WHITE_MASK (0), BLACK_MASK (1), ALPHA_MASK (2), SELECTION_MASK (3), INV_SELECTION_MASK (4) }" } }; diff --git a/app/pdb/tools_cmds.c b/app/pdb/tools_cmds.c index 2cf9ebefb5..1905af6aa9 100644 --- a/app/pdb/tools_cmds.c +++ b/app/pdb/tools_cmds.c @@ -34,7 +34,6 @@ #include "tools/bucket_fill.h" #include "tools/by_color_select.h" #include "tools/clone.h" -#include "tools/gimpcolorpickertool.h" #include "tools/convolve.h" #include "tools/crop.h" #include "tools/dodgeburn.h" @@ -43,6 +42,7 @@ #include "tools/flip_tool.h" #include "tools/free_select.h" #include "tools/fuzzy_select.h" +#include "tools/gimpcolorpickertool.h" #include "tools/gimppaintbrushtool.h" #include "tools/pencil.h" #include "tools/perspective_tool.h" @@ -1928,8 +1928,8 @@ paintbrush_invoker (Argument *args) success = FALSE; if (success) - success = gimp_paintbrush_tool_non_gui (drawable, num_strokes, strokes, fade_out, - method, gradient_length); + success = gimp_paintbrush_tool_non_gui (drawable, num_strokes, strokes, + fade_out, method, gradient_length); return procedural_db_return_args (&paintbrush_proc, success); } diff --git a/app/tools/crop.c b/app/tools/crop.c index f3dd181266..fd6fdaf19f 100644 --- a/app/tools/crop.c +++ b/app/tools/crop.c @@ -1658,11 +1658,12 @@ gimp_crop_tool_destroy (GtkObject *object) void gimp_crop_tool_register (void) { - tool_manager_register_tool(GIMP_TYPE_CROP_TOOL, - "gimp:crop_tool", - _("Crop Tool"), - _("Crop or Resize an image"), - N_("/Tools/Crop Tool"), "C", - NULL, "tools/crop_tool.html", - (const gchar **) crop_bits); + tool_manager_register_tool (GIMP_TYPE_CROP_TOOL, + FALSE, + "gimp:crop_tool", + _("Crop Tool"), + _("Crop or Resize an image"), + N_("/Tools/Crop Tool"), "C", + NULL, "tools/crop_tool.html", + (const gchar **) crop_bits); } diff --git a/app/tools/gimpcroptool.c b/app/tools/gimpcroptool.c index f3dd181266..fd6fdaf19f 100644 --- a/app/tools/gimpcroptool.c +++ b/app/tools/gimpcroptool.c @@ -1658,11 +1658,12 @@ gimp_crop_tool_destroy (GtkObject *object) void gimp_crop_tool_register (void) { - tool_manager_register_tool(GIMP_TYPE_CROP_TOOL, - "gimp:crop_tool", - _("Crop Tool"), - _("Crop or Resize an image"), - N_("/Tools/Crop Tool"), "C", - NULL, "tools/crop_tool.html", - (const gchar **) crop_bits); + tool_manager_register_tool (GIMP_TYPE_CROP_TOOL, + FALSE, + "gimp:crop_tool", + _("Crop Tool"), + _("Crop or Resize an image"), + N_("/Tools/Crop Tool"), "C", + NULL, "tools/crop_tool.html", + (const gchar **) crop_bits); } diff --git a/libgimp/gimpenums.h b/libgimp/gimpenums.h index 450c58da16..17c07df953 100644 --- a/libgimp/gimpenums.h +++ b/libgimp/gimpenums.h @@ -30,7 +30,9 @@ typedef enum { GIMP_WHITE_MASK, GIMP_BLACK_MASK, - GIMP_ALPHA_MASK + GIMP_ALPHA_MASK, + GIMP_SELECTION_MASK, + GIMP_INV_SELECTION_MASK } GimpAddMaskType; typedef enum diff --git a/plug-ins/script-fu/script-fu-constants.c b/plug-ins/script-fu/script-fu-constants.c index 5f2974c23b..ecd6781587 100644 --- a/plug-ins/script-fu/script-fu-constants.c +++ b/plug-ins/script-fu/script-fu-constants.c @@ -26,6 +26,8 @@ init_generated_constants (void) setvar (cintern ("WHITE-MASK"), flocons (0), NIL); setvar (cintern ("BLACK-MASK"), flocons (1), NIL); setvar (cintern ("ALPHA-MASK"), flocons (2), NIL); + setvar (cintern ("SELECTION-MASK"), flocons (3), NIL); + setvar (cintern ("INV-SELECTION-MASK"), flocons (4), NIL); setvar (cintern ("FG-BG-RGB"), flocons (0), NIL); setvar (cintern ("FG-BG-HSV"), flocons (1), NIL); diff --git a/tools/pdbgen/enums.pl b/tools/pdbgen/enums.pl index 5dd44bb56e..64b422005c 100644 --- a/tools/pdbgen/enums.pl +++ b/tools/pdbgen/enums.pl @@ -125,13 +125,18 @@ package Gimp::CodeGen::enums; AddMaskType => { contig => 1, header => 'appenums.h', - symbols => [ qw(ADD_WHITE_MASK ADD_BLACK_MASK ADD_ALPHA_MASK) ], + symbols => [ qw(ADD_WHITE_MASK ADD_BLACK_MASK ADD_ALPHA_MASK + ADD_SELECTION_MASK ADD_INV_SELECTION_MASK) ], mapping => { ADD_WHITE_MASK => '0', ADD_BLACK_MASK => '1', - ADD_ALPHA_MASK => '2' }, + ADD_ALPHA_MASK => '2', + ADD_SELECTION_MASK => '3', + ADD_INV_SELECTION_MASK => '4' }, nicks => { ADD_WHITE_MASK => 'WHITE_MASK', ADD_BLACK_MASK => 'BLACK_MASK', - ADD_ALPHA_MASK => 'ALPHA_MASK' } + ADD_ALPHA_MASK => 'ALPHA_MASK', + ADD_SELECTION_MASK => 'SELECTION_MASK', + ADD_INV_SELECTION_MASK => 'INV_SELECTION_MASK' } }, GradientPaintMode => { contig => 1, diff --git a/tools/pdbgen/pdb/misc_tools.pdb b/tools/pdbgen/pdb/misc_tools.pdb index 486facb489..3963363c06 100644 --- a/tools/pdbgen/pdb/misc_tools.pdb +++ b/tools/pdbgen/pdb/misc_tools.pdb @@ -412,7 +412,7 @@ HELP ); %invoke = ( - headers => [ qw("tools/color_picker.h") ], + headers => [ qw("tools/gimpcolorpickertool.h") ], code => <<'CODE' { if (!sample_merged) @@ -865,10 +865,10 @@ HELP ); %invoke = ( - headers => [ qw("tools/paintbrush.h") ], + headers => [ qw("tools/gimppaintbrushtool.h") ], code => <<'CODE' -success = paintbrush_non_gui (drawable, num_strokes, strokes, fade_out, - method, gradient_length); +success = gimp_paintbrush_tool_non_gui (drawable, num_strokes, strokes, + fade_out, method, gradient_length); CODE ); } @@ -902,9 +902,9 @@ HELP ); %invoke = ( - headers => [ qw("tools/paintbrush.h") ], + headers => [ qw("tools/gimppaintbrushtool.h") ], code => <<'CODE' -success = paintbrush_non_gui_default (drawable, num_strokes, strokes); +success = gimp_paintbrush_tool_non_gui_default (drawable, num_strokes, strokes); CODE ); } diff --git a/tools/pdbgen/pdb/paint_tools.pdb b/tools/pdbgen/pdb/paint_tools.pdb index 486facb489..3963363c06 100644 --- a/tools/pdbgen/pdb/paint_tools.pdb +++ b/tools/pdbgen/pdb/paint_tools.pdb @@ -412,7 +412,7 @@ HELP ); %invoke = ( - headers => [ qw("tools/color_picker.h") ], + headers => [ qw("tools/gimpcolorpickertool.h") ], code => <<'CODE' { if (!sample_merged) @@ -865,10 +865,10 @@ HELP ); %invoke = ( - headers => [ qw("tools/paintbrush.h") ], + headers => [ qw("tools/gimppaintbrushtool.h") ], code => <<'CODE' -success = paintbrush_non_gui (drawable, num_strokes, strokes, fade_out, - method, gradient_length); +success = gimp_paintbrush_tool_non_gui (drawable, num_strokes, strokes, + fade_out, method, gradient_length); CODE ); } @@ -902,9 +902,9 @@ HELP ); %invoke = ( - headers => [ qw("tools/paintbrush.h") ], + headers => [ qw("tools/gimppaintbrushtool.h") ], code => <<'CODE' -success = paintbrush_non_gui_default (drawable, num_strokes, strokes); +success = gimp_paintbrush_tool_non_gui_default (drawable, num_strokes, strokes); CODE ); } diff --git a/tools/pdbgen/pdb/tools.pdb b/tools/pdbgen/pdb/tools.pdb index 486facb489..3963363c06 100644 --- a/tools/pdbgen/pdb/tools.pdb +++ b/tools/pdbgen/pdb/tools.pdb @@ -412,7 +412,7 @@ HELP ); %invoke = ( - headers => [ qw("tools/color_picker.h") ], + headers => [ qw("tools/gimpcolorpickertool.h") ], code => <<'CODE' { if (!sample_merged) @@ -865,10 +865,10 @@ HELP ); %invoke = ( - headers => [ qw("tools/paintbrush.h") ], + headers => [ qw("tools/gimppaintbrushtool.h") ], code => <<'CODE' -success = paintbrush_non_gui (drawable, num_strokes, strokes, fade_out, - method, gradient_length); +success = gimp_paintbrush_tool_non_gui (drawable, num_strokes, strokes, + fade_out, method, gradient_length); CODE ); } @@ -902,9 +902,9 @@ HELP ); %invoke = ( - headers => [ qw("tools/paintbrush.h") ], + headers => [ qw("tools/gimppaintbrushtool.h") ], code => <<'CODE' -success = paintbrush_non_gui_default (drawable, num_strokes, strokes); +success = gimp_paintbrush_tool_non_gui_default (drawable, num_strokes, strokes); CODE ); } diff --git a/tools/pdbgen/pdb/transform_tools.pdb b/tools/pdbgen/pdb/transform_tools.pdb index 486facb489..3963363c06 100644 --- a/tools/pdbgen/pdb/transform_tools.pdb +++ b/tools/pdbgen/pdb/transform_tools.pdb @@ -412,7 +412,7 @@ HELP ); %invoke = ( - headers => [ qw("tools/color_picker.h") ], + headers => [ qw("tools/gimpcolorpickertool.h") ], code => <<'CODE' { if (!sample_merged) @@ -865,10 +865,10 @@ HELP ); %invoke = ( - headers => [ qw("tools/paintbrush.h") ], + headers => [ qw("tools/gimppaintbrushtool.h") ], code => <<'CODE' -success = paintbrush_non_gui (drawable, num_strokes, strokes, fade_out, - method, gradient_length); +success = gimp_paintbrush_tool_non_gui (drawable, num_strokes, strokes, + fade_out, method, gradient_length); CODE ); } @@ -902,9 +902,9 @@ HELP ); %invoke = ( - headers => [ qw("tools/paintbrush.h") ], + headers => [ qw("tools/gimppaintbrushtool.h") ], code => <<'CODE' -success = paintbrush_non_gui_default (drawable, num_strokes, strokes); +success = gimp_paintbrush_tool_non_gui_default (drawable, num_strokes, strokes); CODE ); }