Commit 00feb59a authored by Nate Summers's avatar Nate Summers
Browse files

app/core/core-types.h moved GimpToolInfo back into the core.


 	* app/core/core-types.h
 	* libgimptool/gimptooltypes.h: moved GimpToolInfo back into the core.

 	* libgimptool/gimptoolcontrol.h
	* app/tools/gimptoolcontrol.c: got rid of gimp_tool_control_new

 	* libgimptool/gimptool.c (gimp_tool_init): create the GimpToolControl
 	here instead of in the descendant classes

	* app/tools/gimpairbrushtool.c
 	* app/tools/gimpbezierselecttool.c
	* app/tools/gimpblendtool.c
 	* app/tools/gimpbucketfilltool.c
 	* app/tools/gimpbycolorselecttool.c
	* app/tools/gimpclonetool.c
 	* app/tools/gimpcolorbalancetool.c
 	* app/tools/gimpcolorpickertool.c
	* app/tools/gimpconvolvetool.c
 	* app/tools/gimpcroptool.c
	* app/tools/gimpcurvestool.c
 	* app/tools/gimpdodgeburntool.c
 	* app/tools/gimpeditselectiontool.c
 	* app/tools/gimpellipseselecttool.c
	* app/tools/gimperasertool.c
 	* app/tools/gimpfliptool.c
	* app/tools/gimpfreeselecttool.c
 	* app/tools/gimpfuzzyselecttool.c
	* app/tools/gimphistogramtool.c
 	* app/tools/gimphuesaturationtool.c
	* app/tools/gimpinktool.c
 	* app/tools/gimpiscissorstool.c
	* app/tools/gimplevelstool.c
 	* app/tools/gimpmagnifytool.c
	* app/tools/gimpmeasuretool.c
 	* app/tools/gimpmovetool.c
	* app/tools/gimppaintbrushtool.c
 	* app/tools/gimppathtool.c
	* app/tools/gimppenciltool.c
 	* app/tools/gimpperspectivetool.c
	* app/tools/gimprectselecttool.c
 	* app/tools/gimprotatetool.c
	* app/tools/gimpscaletool.c
 	* app/tools/gimpsheartool.c
	* app/tools/gimpsmudgetool.c
 	* app/tools/gimptexttool.c
 	* app/tools/gimpvectortool.c
 	* plug-ins/tools/tool-safe-mode.c: changed accordingly

	* libgimpproxy/gimpproxytypes.h: autogenerated
parent bbbc0347
......@@ -57,7 +57,7 @@
/* local function prototypes */
static void gimp_color_balance_tool_class_init (GimpColorBalanceToolClass *klass);
static void gimp_color_balance_tool_init (GimpColorBalanceTool *bc_tool);
static void gimp_color_balance_tool_init (GimpTool *tool);
static void gimp_color_balance_tool_initialize (GimpTool *tool,
GimpDisplay *gdisp);
......@@ -158,19 +158,12 @@ gimp_color_balance_tool_class_init (GimpColorBalanceToolClass *klass)
}
static void
gimp_color_balance_tool_init (GimpColorBalanceTool *bc_tool)
gimp_color_balance_tool_init (GimpTool *tool)
{
GIMP_TOOL(bc_tool)->control = gimp_tool_control_new (TRUE, /* scroll_lock */
TRUE, /* auto_snap_to */
FALSE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_HINT, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_TOOL_CURSOR_NONE, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_TOOL_CURSOR_NONE, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_NONE /* toggle_cursor_modifier */);
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_preserve (tool->control, FALSE);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_HINT);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_NONE);
}
static void
......
......@@ -95,7 +95,7 @@ typedef gdouble CRMatrix[4][4];
/* local function prototypes */
static void gimp_curves_tool_class_init (GimpCurvesToolClass *klass);
static void gimp_curves_tool_init (GimpCurvesTool *bc_tool);
static void gimp_curves_tool_init (GimpTool *tool);
static void gimp_curves_tool_initialize (GimpTool *tool,
GimpDisplay *gdisp);
......@@ -267,19 +267,10 @@ gimp_curves_tool_class_init (GimpCurvesToolClass *klass)
}
static void
gimp_curves_tool_init (GimpCurvesTool *bc_tool)
gimp_curves_tool_init (GimpTool *tool)
{
GIMP_TOOL(bc_tool)->control = gimp_tool_control_new (TRUE, /* scroll_lock */
TRUE, /* auto_snap_to */
FALSE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_HINT, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_TOOL_CURSOR_NONE, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_TOOL_CURSOR_NONE, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_NONE /* toggle_cursor_modifier */);
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_preserve (tool->control, FALSE);
}
static void
......
......@@ -68,7 +68,7 @@
/* local function prototypes */
static void gimp_hue_saturation_tool_class_init (GimpHueSaturationToolClass *klass);
static void gimp_hue_saturation_tool_init (GimpHueSaturationTool *bc_tool);
static void gimp_hue_saturation_tool_init (GimpTool *tool);
static void gimp_hue_saturation_tool_initialize (GimpTool *tool,
GimpDisplay *gdisp);
......@@ -182,19 +182,10 @@ gimp_hue_saturation_tool_class_init (GimpHueSaturationToolClass *klass)
}
static void
gimp_hue_saturation_tool_init (GimpHueSaturationTool *tool)
gimp_hue_saturation_tool_init (GimpTool *tool)
{
GIMP_TOOL(tool)->control = gimp_tool_control_new (TRUE, /* scroll_lock */
TRUE, /* auto_snap_to */
FALSE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_HINT, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_TOOL_CURSOR_NONE, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_TOOL_CURSOR_NONE, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_NONE /* toggle_cursor_modifier */);
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_preserve (tool->control, FALSE);
}
static void
......
......@@ -116,6 +116,7 @@ typedef struct _GimpItem GimpItem;
typedef struct _GimpBuffer GimpBuffer;
typedef struct _GimpToolInfo GimpToolInfo; /*< proxy-include >*/
typedef struct _GimpPaintInfo GimpPaintInfo;
typedef struct _GimpImagefile GimpImagefile;
......
......@@ -322,18 +322,8 @@ gimp_ink_tool_init (GimpInkTool *ink_tool)
tool = GIMP_TOOL (ink_tool);
tool->control = gimp_tool_control_new (FALSE, /* scroll_lock */
TRUE, /* auto_snap_to */
TRUE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_EXACT, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_INK_TOOL_CURSOR, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_TOOL_CURSOR_NONE, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_NONE /* toggle_cursor_modifier */);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_INK_TOOL_CURSOR);
}
static void
......
......@@ -117,17 +117,8 @@ gimp_airbrush_tool_init (GimpAirbrushTool *airbrush)
tool = GIMP_TOOL (airbrush);
paint_tool = GIMP_PAINT_TOOL (airbrush);
tool->control = gimp_tool_control_new (FALSE, /* scroll_lock */
TRUE, /* auto_snap_to */
TRUE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_EXACT, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_AIRBRUSH_TOOL_CURSOR, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_TOOL_CURSOR_NONE, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_NONE /* toggle_cursor_modifier */);
gimp_tool_control_set_motion_mode(tool->control, GIMP_MOTION_MODE_EXACT);
gimp_tool_control_set_tool_cursor(tool->control, GIMP_AIRBRUSH_TOOL_CURSOR);
paint_tool->pick_colors = TRUE;
paint_tool->core = g_object_new (GIMP_TYPE_AIRBRUSH, NULL);
......
......@@ -358,17 +358,8 @@ gimp_bezier_select_tool_init (GimpBezierSelectTool *bezier_select)
bezier_select->num_points = 0;
bezier_select->mask = NULL;
tool->control = gimp_tool_control_new (FALSE, /* scroll_lock */
TRUE, /* auto_snap_to */
FALSE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_HINT, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_BEZIER_SELECT_TOOL_CURSOR, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_TOOL_CURSOR_NONE, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_NONE /* toggle_cursor_modifier */);
gimp_tool_control_set_preserve(tool->control, FALSE);
gimp_tool_control_set_tool_cursor(tool->control, GIMP_BEZIER_SELECT_TOOL_CURSOR);
curCore = draw_tool;
curSel = bezier_select;
......
......@@ -218,17 +218,8 @@ gimp_blend_tool_init (GimpBlendTool *blend_tool)
tool = GIMP_TOOL (blend_tool);
tool->control = gimp_tool_control_new (TRUE, /* scroll_lock */
TRUE, /* auto_snap_to */
TRUE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_HINT, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_BLEND_TOOL_CURSOR, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_TOOL_CURSOR_NONE, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_NONE /* toggle_cursor_modifier */);
gimp_tool_control_set_scroll_lock(tool->control, TRUE);
gimp_tool_control_set_tool_cursor(tool->control, GIMP_BLEND_TOOL_CURSOR);
}
......
......@@ -177,17 +177,8 @@ gimp_bucket_fill_tool_init (GimpBucketFillTool *bucket_fill_tool)
tool = GIMP_TOOL (bucket_fill_tool);
tool->control = gimp_tool_control_new (TRUE, /* scroll_lock */
TRUE, /* auto_snap_to */
TRUE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_HINT, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_BUCKET_FILL_TOOL_CURSOR, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_TOOL_CURSOR_NONE, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_NONE /* toggle_cursor_modifier */);
gimp_tool_control_set_scroll_lock(tool->control, TRUE);
gimp_tool_control_set_tool_cursor(tool->control, GIMP_BUCKET_FILL_TOOL_CURSOR);
}
static void
......
......@@ -242,17 +242,8 @@ gimp_by_color_select_tool_init (GimpByColorSelectTool *by_color_select)
tool = GIMP_TOOL (by_color_select);
select_tool = GIMP_SELECTION_TOOL (by_color_select);
tool->control = gimp_tool_control_new (FALSE, /* scroll_lock */
TRUE, /* auto_snap_to */
FALSE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_HINT, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_RECT_SELECT_TOOL_CURSOR, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_TOOL_CURSOR_NONE, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_NONE /* toggle_cursor_modifier */);
gimp_tool_control_set_preserve(tool->control, FALSE);
gimp_tool_control_set_preserve(tool->control, GIMP_RECT_SELECT_TOOL_CURSOR);
by_color_select->x = 0;
by_color_select->y = 0;
......
......@@ -159,18 +159,8 @@ gimp_clone_tool_init (GimpCloneTool *clone)
tool = GIMP_TOOL (clone);
paint_tool = GIMP_PAINT_TOOL (clone);
tool->control = gimp_tool_control_new (FALSE, /* scroll_lock */
TRUE, /* auto_snap_to */
TRUE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_EXACT, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_CLONE_TOOL_CURSOR, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_TOOL_CURSOR_NONE, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_NONE /* toggle_cursor_modifier */);
gimp_tool_control_set_motion_mode(tool->control, GIMP_MOTION_MODE_EXACT);
gimp_tool_control_set_tool_cursor(tool->control, GIMP_CLONE_TOOL_CURSOR);
clone_core->init_callback = gimp_clone_init_callback;
clone_core->finish_callback = gimp_clone_finish_callback;
......
......@@ -57,7 +57,7 @@
/* local function prototypes */
static void gimp_color_balance_tool_class_init (GimpColorBalanceToolClass *klass);
static void gimp_color_balance_tool_init (GimpColorBalanceTool *bc_tool);
static void gimp_color_balance_tool_init (GimpTool *tool);
static void gimp_color_balance_tool_initialize (GimpTool *tool,
GimpDisplay *gdisp);
......@@ -158,19 +158,12 @@ gimp_color_balance_tool_class_init (GimpColorBalanceToolClass *klass)
}
static void
gimp_color_balance_tool_init (GimpColorBalanceTool *bc_tool)
gimp_color_balance_tool_init (GimpTool *tool)
{
GIMP_TOOL(bc_tool)->control = gimp_tool_control_new (TRUE, /* scroll_lock */
TRUE, /* auto_snap_to */
FALSE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_HINT, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_TOOL_CURSOR_NONE, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_TOOL_CURSOR_NONE, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_NONE /* toggle_cursor_modifier */);
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_preserve (tool->control, FALSE);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_HINT);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_NONE);
}
static void
......
......@@ -197,17 +197,8 @@ gimp_color_picker_tool_init (GimpColorPickerTool *color_picker_tool)
tool = GIMP_TOOL (color_picker_tool);
tool->control = gimp_tool_control_new (FALSE, /* scroll_lock */
TRUE, /* auto_snap_to */
FALSE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_HINT, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_COLOR_PICKER_TOOL_CURSOR, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_TOOL_CURSOR_NONE, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_NONE /* toggle_cursor_modifier */);
gimp_tool_control_set_preserve (tool->control, FALSE);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_COLOR_PICKER_TOOL_CURSOR);
}
static void
......
......@@ -145,17 +145,10 @@ gimp_convolve_tool_init (GimpConvolveTool *convolve)
tool = GIMP_TOOL (convolve);
paint_tool = GIMP_PAINT_TOOL (convolve);
tool->control = gimp_tool_control_new (FALSE, /* scroll_lock */
TRUE, /* auto_snap_to */
TRUE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_EXACT, /* motion_mode */
GIMP_BLUR_TOOL_CURSOR, /* cursor */
GIMP_TOOL_CURSOR_NONE, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_BLUR_TOOL_CURSOR, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_MINUS /* toggle_cursor_modifier */);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_BLUR_TOOL_CURSOR);
gimp_tool_control_set_toggle_tool_cursor (tool->control, GIMP_BLUR_TOOL_CURSOR);
gimp_tool_control_set_toggle_cursor_modifier (tool->control, GIMP_CURSOR_MODIFIER_MINUS);
paint_tool->core = g_object_new (GIMP_TYPE_CONVOLVE, NULL);
......
......@@ -253,17 +253,8 @@ gimp_crop_tool_init (GimpCropTool *crop_tool)
tool = GIMP_TOOL (crop_tool);
tool->control = gimp_tool_control_new (FALSE, /* scroll_lock */
TRUE, /* auto_snap_to */
FALSE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_HINT, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_CROP_TOOL_CURSOR, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_TOOL_CURSOR_NONE, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_NONE /* toggle_cursor_modifier */);
gimp_tool_control_set_preserve (tool->control, FALSE);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_CROP_TOOL_CURSOR);
}
static void
......
......@@ -95,7 +95,7 @@ typedef gdouble CRMatrix[4][4];
/* local function prototypes */
static void gimp_curves_tool_class_init (GimpCurvesToolClass *klass);
static void gimp_curves_tool_init (GimpCurvesTool *bc_tool);
static void gimp_curves_tool_init (GimpTool *tool);
static void gimp_curves_tool_initialize (GimpTool *tool,
GimpDisplay *gdisp);
......@@ -267,19 +267,10 @@ gimp_curves_tool_class_init (GimpCurvesToolClass *klass)
}
static void
gimp_curves_tool_init (GimpCurvesTool *bc_tool)
gimp_curves_tool_init (GimpTool *tool)
{
GIMP_TOOL(bc_tool)->control = gimp_tool_control_new (TRUE, /* scroll_lock */
TRUE, /* auto_snap_to */
FALSE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_HINT, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_TOOL_CURSOR_NONE, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_TOOL_CURSOR_NONE, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_NONE /* toggle_cursor_modifier */);
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_preserve (tool->control, FALSE);
}
static void
......
......@@ -123,17 +123,9 @@ gimp_dodgeburn_tool_init (GimpDodgeBurnTool *dodgeburn)
tool = GIMP_TOOL (dodgeburn);
paint_tool = GIMP_PAINT_TOOL (dodgeburn);
tool->control = gimp_tool_control_new (FALSE, /* scroll_lock */
TRUE, /* auto_snap_to */
TRUE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_EXACT, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_DODGE_TOOL_CURSOR, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_BURN_TOOL_CURSOR, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_NONE /* toggle_cursor_modifier */);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_DODGE_TOOL_CURSOR);
gimp_tool_control_set_toggle_tool_cursor (tool->control, GIMP_BURN_TOOL_CURSOR);
paint_tool->core = g_object_new (GIMP_TYPE_DODGEBURN, NULL);
}
......
......@@ -178,17 +178,9 @@ gimp_edit_selection_tool_init (GimpEditSelectionTool *edit_selection_tool)
tool = GIMP_TOOL (edit_selection_tool);
tool->control = gimp_tool_control_new (EDIT_SELECT_SCROLL_LOCK, /* scroll_lock */
FALSE, /* auto_snap_to */
TRUE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_COMPRESS, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_TOOL_CURSOR_NONE, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_TOOL_CURSOR_NONE, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_NONE /* toggle_cursor_modifier */);
gimp_tool_control_set_scroll_lock (tool->control, EDIT_SELECT_SCROLL_LOCK);
gimp_tool_control_set_snap_to (tool->control, FALSE);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_COMPRESS);
edit_selection_tool->origx = 0;
......
......@@ -132,17 +132,8 @@ gimp_ellipse_select_tool_init (GimpEllipseSelectTool *ellipse_select)
tool = GIMP_TOOL (ellipse_select);
select_tool = GIMP_SELECTION_TOOL (ellipse_select);
tool->control = gimp_tool_control_new (FALSE, /* scroll_lock */
TRUE, /* auto_snap_to */
FALSE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_HINT, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_ELLIPSE_SELECT_TOOL_CURSOR, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_TOOL_CURSOR_NONE, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_NONE /* toggle_cursor_modifier */);
gimp_tool_control_set_preserve (tool->control, FALSE);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_ELLIPSE_SELECT_TOOL_CURSOR);
}
static void
......
......@@ -121,17 +121,10 @@ gimp_eraser_tool_init (GimpEraserTool *eraser)
tool = GIMP_TOOL (eraser);
paint_tool = GIMP_PAINT_TOOL (eraser);
tool->control = gimp_tool_control_new (FALSE, /* scroll_lock */
TRUE, /* auto_snap_to */
TRUE, /* preserve */
FALSE, /* handle_empty_image */
GIMP_MOTION_MODE_EXACT, /* motion_mode */
GIMP_MOUSE_CURSOR, /* cursor */
GIMP_ERASER_TOOL_CURSOR, /* tool_cursor */
GIMP_CURSOR_MODIFIER_NONE, /* cursor_modifier */
GIMP_MOUSE_CURSOR, /* toggle_cursor */
GIMP_ERASER_TOOL_CURSOR, /* toggle_tool_cursor */
GIMP_CURSOR_MODIFIER_MINUS /* toggle_cursor_modifier */);
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_ERASER_TOOL_CURSOR);
gimp_tool_control_set_toggle_tool_cursor (tool->control, GIMP_ERASER_TOOL_CURSOR);
gimp_tool_control_set_toggle_cursor_modifier (tool->control, GIMP_CURSOR_MODIFIER_MINUS);
paint_tool->core = g_object_new (GIMP_TYPE_ERASER, NULL);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment