[gimp/soc-2009-siox-drb] 07.01.17

[Jie Ding <jieding src gnome org>]

commit 3450bcbdb700998c8d612c729befb6d022aadf51
Author: Jie Ding <jieding src gnome org>
Date:   Wed Jul 1 17:47:20 2009 +0800

    07.01.17

 app/tools/gimpeditselectiontool.c    |    8 ++++----
 app/tools/gimpforegroundselecttool.c |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/app/tools/gimpeditselectiontool.c b/app/tools/gimpeditselectiontool.c
index 1de4849..ed47916 100644
--- a/app/tools/gimpeditselectiontool.c
+++ b/app/tools/gimpeditselectiontool.c
@@ -32,6 +32,7 @@
 #include "base/boundary.h"
 
 #include "core/gimp.h"
+#include "core/gimp-utils.h"
 #include "core/gimpimage.h"
 #include "core/gimpimage-guides.h"
 #include "core/gimpimage-item-list.h"
@@ -55,7 +56,6 @@
 #include "gimpeditselectiontool.h"
 #include "gimptoolcontrol.h"
 #include "tool_manager.h"
-#include "tools-utils.h"
 
 #include "gimp-intl.h"
 
@@ -601,9 +601,9 @@ gimp_edit_selection_tool_update_motion (GimpEditSelectionTool *edit_select,
 
   if (edit_select->constrain)
     {
-      gimp_tool_motion_constrain (edit_select->start_x, edit_select->start_y,
-                                  &new_x, &new_y,
-                                  GIMP_TOOL_CONSTRAIN_45_DEGREES);
+      gimp_constrain_line (edit_select->start_x, edit_select->start_y,
+                           &new_x, &new_y,
+                           GIMP_CONSTRAIN_LINE_45_DEGREES);
     }
 
   motion_x = new_x - off_x;
diff --git a/app/tools/gimpforegroundselecttool.c b/app/tools/gimpforegroundselecttool.c
index ff8314c..24789d8 100644
--- a/app/tools/gimpforegroundselecttool.c
+++ b/app/tools/gimpforegroundselecttool.c
@@ -458,7 +458,6 @@ gimp_foreground_select_tool_key_press (GimpTool    *tool,
           return FALSE;
         }
     }	
-
   else
       return GIMP_TOOL_CLASS (parent_class)->key_press (tool,
                                                         kevent,
@@ -707,7 +706,8 @@ gimp_foreground_select_tool_draw (GimpDrawTool *draw_tool)
 
 static void
 gimp_foreground_select_tool_select (GimpFreeSelectTool *free_sel,
-                                    GimpDisplay      *display)
+                                    GimpDisplay      *display)//,
+									//GdkEventKey        *kevent)
 {printf("===========gimp_foreground_select_tool_select\n");
   GimpForegroundSelectTool    *fg_select;
   GimpForegroundSelectOptions *options;
@@ -773,7 +773,7 @@ gimp_foreground_select_tool_select (GimpFreeSelectTool *free_sel,
 			//if((kevent->keyval == GDK_Shift_L) || (kevent->keyval == GDK_Shift_R )) 
 			  
 	      //	fg_select->drbsignal= TRUE;
-      fg_select->drbsignal = mark_drb;//(should be a function to push)
+      fg_select->drbsignal = mark_drb;
   }