[Igarden-commit] Garden/source GardenApp.cpp,1.3.2.6,1.3.2.7

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

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

Modified Files:
      Tag: Release_branch_v1
	GardenApp.cpp 
Log Message:
Remove some obsolete code

Index: GardenApp.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/GardenApp.cpp,v
retrieving revision 1.3.2.6
retrieving revision 1.3.2.7
diff -C2 -d -r1.3.2.6 -r1.3.2.7
*** GardenApp.cpp	29 Mar 2008 19:44:04 -0000	1.3.2.6
--- GardenApp.cpp	17 May 2008 21:02:20 -0000	1.3.2.7
***************
*** 139,158 ****
  {
  	XGDirectory	dir;
- #if 0
- 	XGMenu	*editMenu;
- 	short	newIndex, sepIndex;
- 
- 	editMenu = GetCurMenu()->GetMenu(2);
- 	MyAssert(editMenu != NULL);
- 	/**/
- 	sepIndex = editMenu->GetLength();
- 	editMenu->InsertItem(sepIndex);
- 	editMenu->SetText(sepIndex, "-");
- 	/**/
- 	newIndex = editMenu->GetLength();
- 	editMenu->InsertItem(newIndex);
- 	editMenu->SetText(newIndex, "Debug Add Line");
- 	editMenu->SetItemID(newIndex, 14159);
- #endif
  	
  	_initComplete = false;
--- 139,142 ----
***************
*** 215,235 ****
  #endif
  
- #if 0	//!!!OPT_MACOS == 1 build font menu
- 	Str255		fontName;
- 	XGMenuBar	*mbar = GetCurMenu();
- 	MyAssert(mbar != NULL);
- 	XGMenu		*textMenu = mbar->FindByMenuID(2006);
- 	MyAssert(textMenu != NULL);
- 	XGMenu		*fontMenu = textMenu->GetSubMenu(0);
- 	MyAssert(fontMenu != NULL);
-  	for(n = 0; n < count; n++)
-  	{
- 		::GetMenuItemText(fontHdl, n+1, fontName);
- 		yaaf::cvtp2c(fontName);
- 		fontMenu->InsertItem(n);
- 		fontMenu->SetText(n, (char*)fontName);
- 		fontMenu->SetItemID(n, kBaseFontCommand+n);
-  	}
- #endif
  
  	PersistentTags::InitPreferenceTags();
--- 199,202 ----
***************
*** 342,389 ****
  	LoadBackgrounds();
  
- #if 0
- 	if(sourceDB->LocateMaterialByID(kTurfMaterialUIDStr) == NULL)
- 	{
- 		Material		*mat;
- 		measureUnits_t	units;
- 		Length			spread(0);
- 		planLength_t	minHt, maxht, minWid, maxWid;
- 
- 		mat = new Material(sourceDB, kTurfMaterialUIDStr);
- 		mat->SetMaterialType(kMaterialTypeBackground);
- 		mat->SetCommonName(String("Turf"));
- 		mat->SetString(kPlantVarietyPicture, "turf.png");
- 		// Compute size to expand to using scale & image size
- 		PersistentTags	*prefs;
- 		prefs = GetActivePreferences();
- 		units = (measureUnits_t)prefs->GetInt32Pref(kUnitsPref);
- 		spread.StringToLengthRange("8\"", minHt, maxht, units);
- 		spread.StringToLengthRange("8\"", minWid, maxWid, units);
-  		mat->SetInt32(kMaterialLength, maxht);
-  		mat->SetInt32(kMaterialWidth, maxWid);
- 	}
- 
- 	const materialIDStr_t kAsphaltMaterialUIDStr = { "1234684-0000-e73e-00-00-0a-00-00-00-65-f1", "0-0-0-0-0-0-0-0-0-0-0" };
- 	if(sourceDB->LocateMaterialByID(kAsphaltMaterialUIDStr) == NULL)
- 	{
- 		Material		*mat;
- 		measureUnits_t	units;
- 		Length			spread(0);
- 		planLength_t	minHt, maxht, minWid, maxWid;
- 
- 		mat = new Material(sourceDB, kAsphaltMaterialUIDStr);
- 		mat->SetMaterialType(kMaterialTypeBackground);
- 		mat->SetCommonName(String("Asphalt Paving"));
- 		mat->SetString(kPlantVarietyPicture, "turf.png");
- 		// Compute size to expand to using scale & image size
- 		PersistentTags	*prefs;
- 		prefs = GetActivePreferences();
- 		units = (measureUnits_t)prefs->GetInt32Pref(kUnitsPref);
- 		spread.StringToLengthRange("8\"", minHt, maxht, units);
- 		spread.StringToLengthRange("8\"", minWid, maxWid, units);
-  		mat->SetInt32(kMaterialLength, maxht);
-  		mat->SetInt32(kMaterialWidth, maxWid);
- 	}
- #endif
  	UnsanitySCR_RegisterMatchSpecifier(NULL, CFSTR("Redstart Software"), NULL, CFSTR("SCR-57D1B503C4"), NULL);
  	
--- 309,312 ----