app/tools/gimpaligntool.c app/tools/gimpcolorpickertool.c

2007-03-15  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimpaligntool.c
	* app/tools/gimpcolorpickertool.c
	* app/tools/gimppainttool.c
	* app/tools/gimpvectortool.c: remove gimp_tool_pop_status() from
	control() implementations because GimpTool does this generically now.

	* app/tools/gimpblendtool.c
	* app/tools/gimpselectiontool.c: remove entire control()
	implementations because they were doing nothing else.


svn path=/trunk/; revision=22128
This commit is contained in:
Michael Natterer 2007-03-15 17:32:50 +00:00 committed by Michael Natterer
parent 9f650d77f5
commit 40718dc7e4
7 changed files with 12 additions and 50 deletions

View File

@ -1,3 +1,15 @@
2007-03-15 Michael Natterer <mitch@gimp.org>
* app/tools/gimpaligntool.c
* app/tools/gimpcolorpickertool.c
* app/tools/gimppainttool.c
* app/tools/gimpvectortool.c: remove gimp_tool_pop_status() from
control() implementations because GimpTool does this generically now.
* app/tools/gimpblendtool.c
* app/tools/gimpselectiontool.c: remove entire control()
implementations because they were doing nothing else.
2007-03-15 Michael Natterer <mitch@gimp.org>
* app/tools/gimppaintoptions-gui.c (gimp_paint_options_gui): "adj"

View File

@ -239,7 +239,6 @@ gimp_align_tool_control (GimpTool *tool,
case GIMP_TOOL_ACTION_HALT:
clear_all_selected_objects (align_tool);
gimp_tool_pop_status (tool, display);
break;
}

View File

@ -54,9 +54,6 @@
static gboolean gimp_blend_tool_initialize (GimpTool *tool,
GimpDisplay *display,
GError **error);
static void gimp_blend_tool_control (GimpTool *tool,
GimpToolAction action,
GimpDisplay *display);
static void gimp_blend_tool_button_press (GimpTool *tool,
GimpCoords *coords,
guint32 time,
@ -122,7 +119,6 @@ gimp_blend_tool_class_init (GimpBlendToolClass *klass)
GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
tool_class->control = gimp_blend_tool_control;
tool_class->initialize = gimp_blend_tool_initialize;
tool_class->button_press = gimp_blend_tool_button_press;
tool_class->button_release = gimp_blend_tool_button_release;
@ -171,25 +167,6 @@ gimp_blend_tool_initialize (GimpTool *tool,
return TRUE;
}
static void
gimp_blend_tool_control (GimpTool *tool,
GimpToolAction action,
GimpDisplay *display)
{
switch (action)
{
case GIMP_TOOL_ACTION_PAUSE:
case GIMP_TOOL_ACTION_RESUME:
break;
case GIMP_TOOL_ACTION_HALT:
gimp_tool_pop_status (tool, display);
break;
}
GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
}
static void
gimp_blend_tool_button_press (GimpTool *tool,
GimpCoords *coords,

View File

@ -173,7 +173,6 @@ gimp_color_picker_tool_control (GimpTool *tool,
if (picker_tool->dialog)
gimp_color_picker_tool_info_response (NULL, GTK_RESPONSE_CLOSE,
picker_tool);
gimp_tool_pop_status (tool, display);
break;
}

View File

@ -222,7 +222,6 @@ gimp_paint_tool_control (GimpTool *tool,
GIMP_PAINT_TOOL_GET_OPTIONS (tool),
GIMP_PAINT_STATE_FINISH, 0);
gimp_paint_core_cleanup (paint_tool->core);
gimp_tool_pop_status (tool, display);
break;
}

View File

@ -41,9 +41,6 @@
#include "gimp-intl.h"
static void gimp_selection_tool_control (GimpTool *tool,
GimpToolAction action,
GimpDisplay *display);
static void gimp_selection_tool_modifier_key (GimpTool *tool,
GdkModifierType key,
gboolean press,
@ -70,7 +67,6 @@ gimp_selection_tool_class_init (GimpSelectionToolClass *klass)
{
GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
tool_class->control = gimp_selection_tool_control;
tool_class->modifier_key = gimp_selection_tool_modifier_key;
tool_class->key_press = gimp_edit_selection_tool_key_press;
tool_class->oper_update = gimp_selection_tool_oper_update;
@ -86,25 +82,6 @@ gimp_selection_tool_init (GimpSelectionTool *selection_tool)
selection_tool->allow_move = TRUE;
}
static void
gimp_selection_tool_control (GimpTool *tool,
GimpToolAction action,
GimpDisplay *display)
{
switch (action)
{
case GIMP_TOOL_ACTION_PAUSE:
case GIMP_TOOL_ACTION_RESUME:
break;
case GIMP_TOOL_ACTION_HALT:
gimp_tool_pop_status (tool, display);
break;
}
GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
}
static void
gimp_selection_tool_modifier_key (GimpTool *tool,
GdkModifierType key,

View File

@ -231,7 +231,6 @@ gimp_vector_tool_control (GimpTool *tool,
case GIMP_TOOL_ACTION_HALT:
gimp_vector_tool_set_vectors (vector_tool, NULL);
gimp_tool_pop_status (tool, display);
break;
}