[Igarden-commit] Garden/source/PlanTool WritablePlanView.cpp, 1.23.2.1, 1.23.2.2 ActiveMaterial.cpp, 1.45.2.10, 1.45.2.11

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

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

Modified Files:
      Tag: Release_branch_v1
	WritablePlanView.cpp ActiveMaterial.cpp 
Log Message:
BUG: Non-plant items weren't getting into the "All in document" menu

Index: ActiveMaterial.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/PlanTool/ActiveMaterial.cpp,v
retrieving revision 1.45.2.10
retrieving revision 1.45.2.11
diff -C2 -d -r1.45.2.10 -r1.45.2.11
*** ActiveMaterial.cpp	29 Dec 2006 21:19:26 -0000	1.45.2.10
--- ActiveMaterial.cpp	20 Jan 2007 05:44:58 -0000	1.45.2.11
***************
*** 681,684 ****
--- 681,685 ----
  #pragma unused(arg)
  	Material		*mat = (Material*)parg;
+ 	materialID_t	id;
  	
  	if(mat != NULL && _topPalette != NULL)
***************
*** 686,692 ****
  		if(mat->IsNamed(kPreferBoth))
  		{
! 			AddMaterial(mat, true);
! 			_needsUIUpdate = true;		// To be clear.  S/B set by AddMaterial anyway.
! 			_newUpdateID = mat->GetMaterialID();
  		}
  	}
--- 687,697 ----
  		if(mat->IsNamed(kPreferBoth))
  		{
! 			id = mat->GetMaterialID();
! 			if(!_topPalette->IsMaterialIDInSet(id))
! 			{
! 				AddMaterial(mat, true);
! 				_needsUIUpdate = true;		// To be clear.  S/B set by AddMaterial anyway.
! 				_newUpdateID = id;
! 			}
  		}
  	}

Index: WritablePlanView.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/PlanTool/WritablePlanView.cpp,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -C2 -d -r1.23.2.1 -r1.23.2.2
*** WritablePlanView.cpp	6 Jan 2007 15:49:51 -0000	1.23.2.1
--- WritablePlanView.cpp	20 Jan 2007 05:44:58 -0000	1.23.2.2
***************
*** 45,49 ****
--- 45,51 ----
  #include "PlanBackgroundAction.h"
  #include "PlanChangeAction.h"
+ #include "CDatabasePanel.h"
  #include	<XGXMLDOMParser.h>
+ #include <XGBroadcast.h>
  
  using yaaf::RGClipboard;
***************
*** 449,452 ****
--- 451,457 ----
  						InvalView();
  					}
+ 					
+ 					if(copiedItem)
+ 						XGBroadcast::SendBroadcast(kDBAddMsg, 0, copiedItem);
  				}
  			}