[Igarden-commit] Garden/source/PlanTool PlantingBedTool.cpp, 1.8, 1.8.2.1 SelectedElements.cpp, 1.23, 1.23.2.1 PlacementTool.cpp, 1.10, 1.10.2.1

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/Garden/source/PlanTool
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18937

Modified Files:
      Tag: Release_branch_v1
	PlantingBedTool.cpp SelectedElements.cpp PlacementTool.cpp 
Log Message:
Fix delete key on plan view

Index: SelectedElements.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/PlanTool/SelectedElements.cpp,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -d -r1.23 -r1.23.2.1
*** SelectedElements.cpp	15 Sep 2005 21:50:48 -0000	1.23
--- SelectedElements.cpp	20 Jan 2007 00:42:23 -0000	1.23.2.1
***************
*** 448,455 ****
  	for(n = 0; n < numElem && !accepted; n++)
  	{
! 		elem = _selected[n];
! 		tool = elem->GetCreateTool(_view);
! 		if(tool != NULL)
! 			accepted = tool->KeyPressed(_view, value, elem);
  	}
  	
--- 448,458 ----
  	for(n = 0; n < numElem && !accepted; n++)
  	{
! 		if(n < _selected.Length())	// In case a tool deletes selected items
! 		{
! 			elem = _selected[n];
! 			tool = elem->GetCreateTool(_view);
! 			if(tool != NULL)
! 				accepted = tool->KeyPressed(_view, value, elem);
! 		}
  	}
  	

Index: PlantingBedTool.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/PlanTool/PlantingBedTool.cpp,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** PlantingBedTool.cpp	21 Jun 2006 02:45:27 -0000	1.8
--- PlantingBedTool.cpp	20 Jan 2007 00:42:23 -0000	1.8.2.1
***************
*** 181,185 ****
  bool PlantingBedTool::KeyPressed(PlanView * view, long keyEvent, Element* element)
  {
! 	return PlanTool::PathWidthKeyPressed(view, keyEvent, element);
  }
  
--- 181,191 ----
  bool PlantingBedTool::KeyPressed(PlanView * view, long keyEvent, Element* element)
  {
! 	bool	accepted;
! 	
! 	accepted = PlanTool::PathWidthKeyPressed(view, keyEvent, element);
! 	if(!accepted)
! 		accepted = PlanTool::KeyPressed(view, keyEvent, element);
! 	
! 	return accepted;
  }
  

Index: PlacementTool.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/PlanTool/PlacementTool.cpp,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** PlacementTool.cpp	21 Jun 2006 02:45:27 -0000	1.10
--- PlacementTool.cpp	20 Jan 2007 00:42:23 -0000	1.10.2.1
***************
*** 154,157 ****
  bool PlacementTool::KeyPressed(PlanView * view, long keyEvent, Element* element)
  {
! 	return PlanTool::PathWidthKeyPressed(view, keyEvent, element);
  }
--- 154,163 ----
  bool PlacementTool::KeyPressed(PlanView * view, long keyEvent, Element* element)
  {
! 	bool	accepted;
! 	
! 	accepted = PlanTool::PathWidthKeyPressed(view, keyEvent, element);
! 	if(!accepted)
! 		accepted = PlanTool::KeyPressed(view, keyEvent, element);
! 	
! 	return accepted;
  }