gimp r25602 - in branches/gimp-2-4: . app/tools

[martinn svn gnome org]

Author: martinn
Date: Sat May 10 07:45:12 2008
New Revision: 25602
URL: http://svn.gnome.org/viewvc/gimp?rev=25602&view=rev

Log:
2008-05-10  Martin Nordholts  <martinn svn gnome org>

	Merged from trunk:

	* app/tools/gimpcroptool.c: Add a GimpRectangleTool::cancel()
	implementation that updates default aspect ratio when cancelling a
	crop.


Modified:
   branches/gimp-2-4/ChangeLog
   branches/gimp-2-4/app/tools/gimpcroptool.c

Modified: branches/gimp-2-4/app/tools/gimpcroptool.c
==============================================================================
--- branches/gimp-2-4/app/tools/gimpcroptool.c	(original)
+++ branches/gimp-2-4/app/tools/gimpcroptool.c	Sat May 10 07:45:12 2008
@@ -94,6 +94,7 @@
                                                   GimpCropTool          *crop_tool);
 
 static void   gimp_crop_tool_image_size_changed  (GimpCropTool          *crop_tool);
+static void   gimp_crop_tool_cancel              (GimpRectangleTool     *rect_tool);
 
 
 G_DEFINE_TYPE_WITH_CODE (GimpCropTool, gimp_crop_tool, GIMP_TYPE_DRAW_TOOL,
@@ -151,6 +152,7 @@
 gimp_crop_tool_rectangle_tool_iface_init (GimpRectangleToolInterface *iface)
 {
   iface->execute = gimp_crop_tool_execute;
+  iface->cancel  = gimp_crop_tool_cancel;
 }
 
 static void
@@ -435,3 +437,10 @@
   gimp_crop_tool_update_option_defaults (crop_tool,
                                          FALSE);
 }
+
+static void
+gimp_crop_tool_cancel (GimpRectangleTool *rect_tool)
+{
+  gimp_crop_tool_update_option_defaults (GIMP_CROP_TOOL (rect_tool),
+                                         TRUE);
+}