From 40718dc7e4b710d6b6dd1f7997474e1e5719548f Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Thu, 15 Mar 2007 17:32:50 +0000 Subject: [PATCH] app/tools/gimpaligntool.c app/tools/gimpcolorpickertool.c 2007-03-15 Michael Natterer * 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 --- ChangeLog | 12 ++++++++++++ app/tools/gimpaligntool.c | 1 - app/tools/gimpblendtool.c | 23 ----------------------- app/tools/gimpcolorpickertool.c | 1 - app/tools/gimppainttool.c | 1 - app/tools/gimpselectiontool.c | 23 ----------------------- app/tools/gimpvectortool.c | 1 - 7 files changed, 12 insertions(+), 50 deletions(-) diff --git a/ChangeLog b/ChangeLog index c35872d98f..be4ad7fe98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-03-15 Michael Natterer + + * 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 * app/tools/gimppaintoptions-gui.c (gimp_paint_options_gui): "adj" diff --git a/app/tools/gimpaligntool.c b/app/tools/gimpaligntool.c index bda4c3f765..b3d92678eb 100644 --- a/app/tools/gimpaligntool.c +++ b/app/tools/gimpaligntool.c @@ -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; } diff --git a/app/tools/gimpblendtool.c b/app/tools/gimpblendtool.c index 212ce503ef..af9e807f36 100644 --- a/app/tools/gimpblendtool.c +++ b/app/tools/gimpblendtool.c @@ -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, diff --git a/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c index bd8c11ba03..39c3fae426 100644 --- a/app/tools/gimpcolorpickertool.c +++ b/app/tools/gimpcolorpickertool.c @@ -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; } diff --git a/app/tools/gimppainttool.c b/app/tools/gimppainttool.c index a33d4ca09f..2acb83f2f3 100644 --- a/app/tools/gimppainttool.c +++ b/app/tools/gimppainttool.c @@ -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; } diff --git a/app/tools/gimpselectiontool.c b/app/tools/gimpselectiontool.c index 3d913ea733..7ae6f9f0cc 100644 --- a/app/tools/gimpselectiontool.c +++ b/app/tools/gimpselectiontool.c @@ -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, diff --git a/app/tools/gimpvectortool.c b/app/tools/gimpvectortool.c index 756ecfca82..855273d3e6 100644 --- a/app/tools/gimpvectortool.c +++ b/app/tools/gimpvectortool.c @@ -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; }