Fix a bug in tk_getOpenFile - files with no types are rejected when they would

pass in Mac OS Classic.
Add the tkMacOSXCarbonEvents.c - just a skeleton right now.
A bunch of formatting nits fixed.

2 files changed, 1073 insertions, 47 deletions

diff --git a/macosx/Wish.pbproj/jingham.pbxuser b/macosx/Wish.pbproj/jingham.pbxuser
index 7deb7ad..55b4d5d 100644
--- a/macosx/Wish.pbproj/jingham.pbxuser
+++ b/macosx/Wish.pbproj/jingham.pbxuser
@@ -1,23 +1,593 @@
 // !$*UTF8*$!
 {
+	4CDDF1E7052BE83A00D368E9 = {
+		isa = PBXSourceControlManager;
+		scmConfiguration = {
+		};
+		scmType = scm.cvs;
+	};
+	4CDDF1E8052BE83A00D368E9 = {
+		indexTemplatePath = "";
+		isa = PBXCodeSenseManager;
+		usesDefaults = 1;
+		wantsCodeCompletion = 1;
+		wantsCodeCompletionAutoPopup = 0;
+		wantsCodeCompletionAutoSuggestions = 0;
+		wantsCodeCompletionCaseSensitivity = 1;
+		wantsCodeCompletionOnlyMatchingItems = 1;
+		wantsCodeCompletionParametersIncluded = 1;
+		wantsCodeCompletionPlaceholdersInserted = 1;
+		wantsCodeCompletionTabCompletes = 1;
+		wantsIndex = 1;
+	};
+	4CF74254054860EF002A4BED = {
+		fileReference = F5375550016C376E01DC9062;
+		isa = PBXFileBreakpoint;
+		lineNumber = 1056;
+		state = 1;
+	};
+	4CF742790548732C002A4BED = {
+		fileReference = F5375550016C376E01DC9062;
+		isa = PBXFileBreakpoint;
+		lineNumber = 298;
+		state = 1;
+	};
+	4CF7428305487DBD002A4BED = {
+		fileReference = F5375550016C376E01DC9062;
+		isa = PBXFileBreakpoint;
+		lineNumber = 827;
+		state = 1;
+	};
 	F537552A016C352C01DC9062 = {
 		activeBuildStyle = F537552C016C352C01DC9062;
 		activeExecutable = F9B92F14047876F1006F146B;
-		activeTarget = F53756A0016C4DD401DC9062;
+		activeTarget = F53755DF016C38D201DC9062;
+		addToTargets = (
+			F53755DF016C38D201DC9062,
+		);
 		breakpoints = (
+			4CF74254054860EF002A4BED,
+			4CF742790548732C002A4BED,
+			4CF7428305487DBD002A4BED,
 		);
+		codeSenseManager = 4CDDF1E8052BE83A00D368E9;
 		executables = (
 			F9B92F14047876F1006F146B,
 		);
 		perUserDictionary = {
-			PBXPerProjectTemplateStateSaveDate = 79872368;
-			PBXWorkspaceStateSaveDate = 79872368;
+			PBXConfiguration.PBXFileTableDataSource3.PBXExecutablesDataSource = {
+				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+				PBXFileTableDataSourceColumnSortingKey = PBXExecutablesDataSource_NameID;
+				PBXFileTableDataSourceColumnWidthsKey = (
+					22,
+					91.79736,
+				);
+				PBXFileTableDataSourceColumnsKey = (
+					PBXExecutablesDataSource_ActiveFlagID,
+					PBXExecutablesDataSource_NameID,
+				);
+			};
+			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
+				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
+				PBXFileTableDataSourceColumnWidthsKey = (
+					20,
+					10,
+					20,
+					10,
+					43,
+					43,
+					20,
+				);
+				PBXFileTableDataSourceColumnsKey = (
+					PBXFileDataSource_FiletypeID,
+					PBXFileDataSource_Filename_ColumnID,
+					PBXFileDataSource_Built_ColumnID,
+					PBXFileDataSource_ObjectSize_ColumnID,
+					PBXFileDataSource_Errors_ColumnID,
+					PBXFileDataSource_Warnings_ColumnID,
+					PBXFileDataSource_Target_ColumnID,
+				);
+			};
+			PBXConfiguration.PBXFileTableDataSource3.PBXFindDataSource = {
+				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+				PBXFileTableDataSourceColumnSortingKey = PBXFindDataSource_LocationID;
+				PBXFileTableDataSourceColumnWidthsKey = (
+					196.2974,
+					198.2085,
+				);
+				PBXFileTableDataSourceColumnsKey = (
+					PBXFindDataSource_MessageID,
+					PBXFindDataSource_LocationID,
+				);
+			};
+			PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = {
+				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
+				PBXFileTableDataSourceColumnWidthsKey = (
+					20,
+					10,
+					10,
+					20,
+					10,
+					43,
+					43,
+				);
+				PBXFileTableDataSourceColumnsKey = (
+					PBXFileDataSource_FiletypeID,
+					PBXFileDataSource_Filename_ColumnID,
+					PBXTargetDataSource_PrimaryAttribute,
+					PBXFileDataSource_Built_ColumnID,
+					PBXFileDataSource_ObjectSize_ColumnID,
+					PBXFileDataSource_Errors_ColumnID,
+					PBXFileDataSource_Warnings_ColumnID,
+				);
+			};
+			PBXPerProjectTemplateStateSaveDate = 98583016;
+			PBXPrepackagedSmartGroups_v2 = (
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					activationKey = OldTargetSmartGroup;
+					clz = PBXTargetSmartGroup;
+					description = "Displays all targets of the project.";
+					globalID = 1C37FABC04509CD000000102;
+					name = Targets;
+					preferences = {
+						image = Targets;
+					};
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXTargetSmartGroup2;
+					description = "Displays all targets of the project as well as nested build phases.";
+					globalID = 1C37FBAC04509CD000000102;
+					name = Targets;
+					preferences = {
+						image = Targets;
+					};
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXExecutablesSmartGroup;
+					description = "Displays all executables of the project.";
+					globalID = 1C37FAAC04509CD000000102;
+					name = Executables;
+					preferences = {
+						image = Executable;
+					};
+				},
+				{
+					" PBXTransientLocationAtTop " = bottom;
+					absolutePathToBundle = "";
+					clz = PBXErrorsWarningsSmartGroup;
+					description = "Displays files with errors or warnings.";
+					globalID = 1C08E77C0454961000C914BD;
+					name = "Errors and Warnings";
+					preferences = {
+						fnmatch = "";
+						image = WarningsErrors;
+						recursive = 1;
+						regex = "";
+						root = "<PROJECT>";
+					};
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXFilenameSmartGroup;
+					description = "Filters items in a given group (potentially recursively) based on matching the name with the regular expression of the filter.";
+					globalID = 1CC0EA4004350EF90044410B;
+					name = "Implementation Files";
+					preferences = {
+						canSave = 1;
+						fnmatch = "";
+						image = SmartFolder;
+						isLeaf = 0;
+						recursive = 1;
+						regex = "?*\\.[mcMC]";
+						root = "<PROJECT>";
+					};
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXFilenameSmartGroup;
+					description = "This group displays Interface Builder NIB Files.";
+					globalID = 1CC0EA4004350EF90041110B;
+					name = "NIB Files";
+					preferences = {
+						canSave = 1;
+						fnmatch = "*.nib";
+						image = SmartFolder;
+						isLeaf = 0;
+						recursive = 1;
+						regex = "";
+						root = "<PROJECT>";
+					};
+				},
+				{
+					PBXTransientLocationAtTop = no;
+					absolutePathToBundle = "";
+					clz = PBXFindSmartGroup;
+					description = "Displays Find Results.";
+					globalID = 1C37FABC05509CD000000102;
+					name = "Find Results";
+					preferences = {
+						image = spyglass;
+					};
+				},
+				{
+					PBXTransientLocationAtTop = no;
+					absolutePathToBundle = "";
+					clz = PBXBookmarksSmartGroup;
+					description = "Displays Project Bookmarks.";
+					globalID = 1C37FABC05539CD112110102;
+					name = Bookmarks;
+					preferences = {
+						image = Bookmarks;
+					};
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = XCSCMSmartGroup;
+					description = "Displays files with interesting SCM status.";
+					globalID = E2644B35053B69B200211256;
+					name = SCM;
+					preferences = {
+						image = PBXRepository;
+						isLeaf = 0;
+					};
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXSymbolsSmartGroup;
+					description = "Displays all symbols for the project.";
+					globalID = 1C37FABC04509CD000100104;
+					name = "Project Symbols";
+					preferences = {
+						image = ProjectSymbols;
+						isLeaf = 1;
+					};
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXFilenameSmartGroup;
+					description = "Filters items in a given group (potentially recursively) based on matching the name with the regular expression of the filter.";
+					globalID = PBXTemplateMarker;
+					name = "Simple Filter SmartGroup";
+					preferences = {
+						canSave = 1;
+						fnmatch = "*.nib";
+						image = SmartFolder;
+						isLeaf = 0;
+						recursive = 1;
+						regex = "";
+						root = "<PROJECT>";
+					};
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXFilenameSmartGroup;
+					description = "Filters items in a given group (potentially recursively) based on matching the name with the regular expression of the filter.";
+					globalID = PBXTemplateMarker;
+					name = "Simple Regular Expression SmartGroup";
+					preferences = {
+						canSave = 1;
+						fnmatch = "";
+						image = SmartFolder;
+						isLeaf = 0;
+						recursive = 1;
+						regex = "?*\\.[mcMC]";
+						root = "<PROJECT>";
+					};
+				},
+			);
+			PBXWorkspaceContents = (
+				{
+					PBXProjectWorkspaceModule_StateKey_Rev39 = {
+						PBXProjectWorkspaceModule_DataSourceSelectionKey_Rev6 = {
+							BoundsStr = "{{0, 0}, {122, 474}}";
+							Rows = (
+							);
+							VisibleRectStr = "{{0, 0}, {104, 474}}";
+						};
+						PBXProjectWorkspaceModule_EditorOpen = false;
+						PBXProjectWorkspaceModule_EmbeddedNavigatorGroup = {
+							PBXSplitModuleInNavigatorKey = {
+								SplitCount = 1;
+							};
+						};
+						PBXProjectWorkspaceModule_GeometryKey_Rev15 = {
+							PBXProjectWorkspaceModule_SGTM_Geometry = {
+								_collapsingFrameDimension = 199;
+								_indexOfCollapsedView = 1;
+								_percentageOfCollapsedView = 0.5223097;
+								isCollapsed = yes;
+								sizes = (
+									"{{0, 0}, {301, 470}}",
+								);
+							};
+						};
+						PBXProjectWorkspaceModule_OldDetailFrame = "{{0, 0}, {119, 491}}";
+						PBXProjectWorkspaceModule_OldEditorFrame = "{{0, 0}, {750, 480}}";
+						PBXProjectWorkspaceModule_OldSuperviewFrame = "{{182, 0}, {119, 491}}";
+						PBXProjectWorkspaceModule_SGTM = {
+							PBXBottomSmartGroupGIDs = (
+								1C37FBAC04509CD000000102,
+								1C37FAAC04509CD000000102,
+								1C08E77C0454961000C914BD,
+								1C37FABC05509CD000000102,
+								1C37FABC05539CD112110102,
+								E2644B35053B69B200211256,
+								1C37FABC04509CD000100104,
+								1CC0EA4004350EF90044410B,
+								1CC0EA4004350EF90041110B,
+							);
+							PBXSmartGroupTreeModuleColumnData = {
+								PBXSmartGroupTreeModuleColumnWidthsKey = (
+									284,
+								);
+								PBXSmartGroupTreeModuleColumnsKey_v4 = (
+									MainColumn,
+								);
+							};
+							PBXSmartGroupTreeModuleOutlineStateKey_v7 = {
+								PBXSmartGroupTreeModuleOutlineStateExpansionKey = (
+									1C37FBAC04509CD000000102,
+									1C37FAAC04509CD000000102,
+								);
+								PBXSmartGroupTreeModuleOutlineStateSelectionKey = (
+									(
+										6,
+										5,
+									),
+								);
+								PBXSmartGroupTreeModuleOutlineStateVisibleRectKey = "{{0, 0}, {284, 452}}";
+							};
+							PBXTopSmartGroupGIDs = (
+							);
+						};
+					};
+				},
+			);
+			"PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXBatchFindModule" = {
+			};
+			"PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXBuildResultsModule" = {
+			};
+			"PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXCVSModule" = {
+			};
+			"PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXDebugBreakpointsModule" = {
+			};
+			"PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXDebugCLIModule" = {
+			};
+			"PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXDebugSessionModule" = {
+			};
+			"PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXNavigatorGroup" = {
+				PBXSplitModuleInNavigatorKey = {
+					SplitCount = 1;
+				};
+			};
+			"PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXProjectWorkspaceModule" = {
+				PBXProjectWorkspaceModule_StateKey_Rev39 = {
+					PBXProjectWorkspaceModule_DataSourceSelectionKey_Rev6 = {
+						BoundsStr = "{{0, 0}, {194, 474}}";
+						Rows = (
+						);
+						VisibleRectStr = "{{0, 0}, {104, 474}}";
+					};
+					PBXProjectWorkspaceModule_EditorOpen = false;
+					PBXProjectWorkspaceModule_EmbeddedNavigatorGroup = {
+						PBXSplitModuleInNavigatorKey = {
+							SplitCount = 1;
+						};
+					};
+					PBXProjectWorkspaceModule_GeometryKey_Rev15 = {
+						PBXProjectWorkspaceModule_SGTM_Geometry = {
+							_collapsingFrameDimension = 199;
+							_indexOfCollapsedView = 1;
+							_percentageOfCollapsedView = 0.5223097;
+							isCollapsed = yes;
+							sizes = (
+								"{{0, 0}, {301, 470}}",
+							);
+						};
+					};
+					PBXProjectWorkspaceModule_OldDetailFrame = "{{0, 0}, {119, 491}}";
+					PBXProjectWorkspaceModule_OldEditorFrame = "{{0, 0}, {750, 480}}";
+					PBXProjectWorkspaceModule_OldSuperviewFrame = "{{182, 0}, {119, 491}}";
+					PBXProjectWorkspaceModule_SGTM = {
+						PBXBottomSmartGroupGIDs = (
+							1C37FBAC04509CD000000102,
+							1C37FAAC04509CD000000102,
+							1C08E77C0454961000C914BD,
+							1C37FABC05509CD000000102,
+							1C37FABC05539CD112110102,
+							E2644B35053B69B200211256,
+							1C37FABC04509CD000100104,
+							1CC0EA4004350EF90044410B,
+							1CC0EA4004350EF90041110B,
+						);
+						PBXSmartGroupTreeModuleColumnData = {
+							PBXSmartGroupTreeModuleColumnWidthsKey = (
+								284,
+							);
+							PBXSmartGroupTreeModuleColumnsKey_v4 = (
+								MainColumn,
+							);
+						};
+						PBXSmartGroupTreeModuleOutlineStateKey_v7 = {
+							PBXSmartGroupTreeModuleOutlineStateExpansionKey = (
+								F537552B016C352C01DC9062,
+								F537553C016C376E01DC9062,
+								F5375546016C376E01DC9062,
+								1C37FAAC04509CD000000102,
+							);
+							PBXSmartGroupTreeModuleOutlineStateSelectionKey = (
+								(
+									9,
+									7,
+									0,
+								),
+							);
+							PBXSmartGroupTreeModuleOutlineStateVisibleRectKey = "{{0, 153}, {284, 452}}";
+						};
+						PBXTopSmartGroupGIDs = (
+						);
+					};
+				};
+			};
+			PBXWorkspaceGeometries = (
+				{
+					Frame = "{{0, 0}, {301, 470}}";
+					PBXProjectWorkspaceModule_GeometryKey_Rev15 = {
+					};
+					RubberWindowFrame = "52 234 301 512 0 0 1024 746 ";
+				},
+			);
+			"PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXBatchFindModule" = {
+				Frame = "{{0, 0}, {543, 158}}";
+				WindowFrame = "{{-38, 566}, {543, 158}}";
+			};
+			"PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXBuildResultsModule" = {
+				Frame = "{{0, 0}, {908, 553}}";
+				PBXModuleWindowStatusBarHidden = YES;
+				RubberWindowFrame = "95 97 908 574 0 0 1024 746 ";
+			};
+			"PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXCVSModule" = {
+				Frame = "{{0, 0}, {482, 296}}";
+				WindowFrame = "{{264, 214}, {482, 318}}";
+			};
+			"PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXDebugBreakpointsModule" = {
+				BreakpointsTreeTableConfiguration = (
+					enabledColumn,
+					16,
+					breakpointColumn,
+					282.583,
+				);
+				Frame = "{{0, 0}, {208, 494}}";
+				WindowFrame = "{{264, 214}, {208, 516}}";
+			};
+			"PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXDebugCLIModule" = {
+				Frame = "{{0, 0}, {400, 201}}";
+				PBXModuleWindowStatusBarHidden = YES;
+				WindowFrame = "{{50, 718}, {400, 222}}";
+			};
+			"PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXDebugSessionModule" = {
+				DebugConsoleDrawerSize = "{100, 120}";
+				DebugConsoleVisible = None;
+				DebugConsoleWindowFrame = "{{68, 71}, {714, 320}}";
+				DebugSTDIOWindowFrame = "{{132, 34}, {500, 300}}";
+				Frame = "{{0, 0}, {833, 601}}";
+				WindowFrame = "{{170, 67}, {833, 679}}";
+			};
+			"PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXNavigatorGroup" = {
+				Frame = "{{0, 0}, {750, 481}}";
+				PBXModuleWindowStatusBarHidden = YES;
+				WindowFrame = "{{42, 186}, {750, 534}}";
+			};
+			"PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXProjectWorkspaceModule" = {
+				Frame = "{{0, 0}, {301, 470}}";
+				PBXProjectWorkspaceModule_GeometryKey_Rev15 = {
+				};
+				RubberWindowFrame = "52 234 301 512 0 0 1024 746 ";
+			};
+			PBXWorkspaceStateSaveDate = 98583016;
 		};
-		projectwideBuildSettings = {
+		sourceControlManager = 4CDDF1E7052BE83A00D368E9;
+		userBuildSettings = {
 			SYMROOT = "${SRCROOT}/../../build/tk";
 		};
-		wantsIndex = 1;
-		wantsSCM = -1;
+	};
+	F537553E016C376E01DC9062 = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {711, 489}}";
+			sepNavSelRange = "{385, 27}";
+			sepNavVisRect = "{{0, 0}, {711, 428}}";
+			sepNavWindowFrame = "{{203, 39}, {750, 534}}";
+		};
+	};
+	F5375542016C376E01DC9062 = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {711, 2295}}";
+			sepNavSelRange = "{502, 22}";
+			sepNavVisRect = "{{0, 0}, {711, 428}}";
+			sepNavWindowFrame = "{{180, 60}, {750, 534}}";
+		};
+	};
+	F537554A016C376E01DC9062 = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {711, 22847}}";
+			sepNavSelRange = "{43750, 22}";
+			sepNavVisRect = "{{0, 18179}, {711, 449}}";
+			sepNavWindowFrame = "{{11, 212}, {750, 534}}";
+		};
+	};
+	F5375550016C376E01DC9062 = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {671, 23141}}";
+			sepNavSelRange = "{25487, 0}";
+			sepNavVisRect = "{{0, 11543}, {671, 626}}";
+			sepNavWindowFrame = "{{300, 14}, {710, 732}}";
+		};
+	};
+	F5375559016C376E01DC9062 = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {656, 49294}}";
+			sepNavSelRange = "{31126, 2}";
+			sepNavVisRect = "{{0, 13720}, {561, 154}}";
+		};
+	};
+	F537555A016C376E01DC9062 = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {716, 12221}}";
+			sepNavSelRange = "{23385, 2}";
+			sepNavVisRect = "{{0, 10164}, {561, 154}}";
+		};
+	};
+	F5375560016C376E01DC9062 = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {632, 15959}}";
+			sepNavSelRange = "{20295, 0}";
+			sepNavVisRect = "{{0, 8680}, {619, 641}}";
+			sepNavWindowFrame = "{{202, 20}, {658, 726}}";
+		};
+	};
+	F537557D016C37A601DC9062 = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {653, 2897}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRect = "{{0, 1352}, {653, 654}}";
+		};
+	};
+	F5375580016C389901DC9062 = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {711, 20075}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRect = "{{0, 0}, {711, 428}}";
+			sepNavWindowFrame = "{{19, 207}, {750, 534}}";
+		};
+	};
+	F5375583016C389901DC9062 = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {848, 66359}}";
+			sepNavSelRange = "{6145, 14}";
+			sepNavVisRect = "{{0, 2089}, {711, 428}}";
+			sepNavWindowFrame = "{{111, 123}, {750, 534}}";
+		};
+	};
+	F5375599016C389901DC9062 = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {794, 6915}}";
+			sepNavSelRange = "{4072, 0}";
+			sepNavVisRect = "{{0, 1708}, {794, 267}}";
+		};
 	};
 	F53755DF016C38D201DC9062 = {
 		activeExec = 0;
@@ -31,6 +601,14 @@
 	F548F8CE0313CEF0016F146B = {
 		activeExec = 0;
 	};
+	F92ED9910403D0F0006F146B = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {711, 135155}}";
+			sepNavSelRange = "{0, 345}";
+			sepNavVisRect = "{{0, 0}, {711, 449}}";
+			sepNavWindowFrame = "{{180, 60}, {750, 534}}";
+		};
+	};
 	F9B92F14047876F1006F146B = {
 		activeArgIndex = 2147483647;
 		activeArgIndices = (
diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj
index 37a5f26..fe917ed 100644
--- a/macosx/Wish.pbproj/project.pbxproj
+++ b/macosx/Wish.pbproj/project.pbxproj
@@ -3,13 +3,15 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 38;
+	objectVersion = 39;
 	objects = {
 		4C3B4CF6040B18B200C916F0 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.rez;
 			path = tkMacOSXAETE.r;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		4C3B4CF7040B18B200C916F0 = {
 			fileRef = 4C3B4CF6040B18B200C916F0;
@@ -17,6 +19,34 @@
 			settings = {
 			};
 		};
+		4C8A204005E041E800C18A82 = {
+			containerPortal = F537552A016C352C01DC9062;
+			isa = PBXContainerItemProxy;
+			proxyType = 1;
+			remoteGlobalIDString = F548F8CE0313CEF0016F146B;
+			remoteInfo = TkStubLibrary;
+		};
+		4C8A204105E041E800C18A82 = {
+			containerPortal = F537552A016C352C01DC9062;
+			isa = PBXContainerItemProxy;
+			proxyType = 1;
+			remoteGlobalIDString = F53755DF016C38D201DC9062;
+			remoteInfo = TkLibrary;
+		};
+		4C8A204405E0421900C18A82 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = tkMacOSXCarbonEvents.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		4C8A204505E0421900C18A82 = {
+			fileRef = 4C8A204405E0421900C18A82;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 //4C0
 //4C1
 //4C2
@@ -28,10 +58,13 @@
 //F53
 //F54
 		F50D96120196176E01DC9062 = {
+			fallbackIsa = PBXFileReference;
 			isa = PBXFrameworkReference;
+			lastKnownFileType = wrapper.framework;
 			name = ApplicationServices.framework;
 			path = /System/Library/Frameworks/ApplicationServices.framework;
 			refType = 0;
+			sourceTree = "<absolute>";
 		};
 		F50D96130196176E01DC9062 = {
 			fileRef = F50D96120196176E01DC9062;
@@ -127,16 +160,14 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			generatedFileNames = (
-			);
 			isa = PBXShellScriptBuildPhase;
-			neededFileNames = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "if [ \"${BUILD_STYLE}\" = \"Development\" ]; then\n\t# keep copy of debug library around, so that\n\t# Deployment build can be installed on top\n\t# of Development build without overwriting it\n\tcd \"${TARGET_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Versions/${FRAMEWORK_VERSION}\"\n\tcp -fp \"${PRODUCT_NAME}\" \"${PRODUCT_NAME}_debug\"\n\tln -fs \"Versions/Current/${PRODUCT_NAME}_debug\" ../..\n\tcp -fp \"libtkstub${FRAMEWORK_VERSION}.a\" \"libtkstub${FRAMEWORK_VERSION}g.a\"\n\n\t# force Deployment build to be relinked next time\n\tif [ -f \"${OBJROOT}/Deployment.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\" ]; then\n\t    touch -t `date -r \\`expr \\\\\\`date +\"%s\"\\\\\\` + 30\\` +\"%Y%m%d%H%M.%S\"` \"${OBJROOT}/Deployment.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\"\n\tfi\nelse\n\t# force Development build to be relinked next time\n\tif [ -f \"${OBJROOT}/Development.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\" ]; then\n\t    touch -t `date -r \\`expr \\\\\\`date +\"%s\"\\\\\\` + 30\\` +\"%Y%m%d%H%M.%S\"` \"${OBJROOT}/Development.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\"\n\tfi\nfi\n\n# fixup Framework structure\ncd \"${TARGET_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Versions/${FRAMEWORK_VERSION}\"\nln -fs `ls libtkstub* | sed -e \"s|.*|Versions/${FRAMEWORK_VERSION}/&|\"` ../..\nln -fs \"Versions/Current/tkConfig.sh\" ../..\nranlib libtkstub${FRAMEWORK_VERSION}*.a";
 		};
 		F537552A016C352C01DC9062 = {
+			buildSettings = {
+			};
 			buildStyles = (
 				F537552C016C352C01DC9062,
 				F537552D016C352C01DC9062,
@@ -168,14 +199,20 @@
 			);
 			isa = PBXGroup;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537552C016C352C01DC9062 = {
 			buildRules = (
 			);
 			buildSettings = {
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
 				OTHER_LDFLAGS = "\U0001-prebind";
 				TEMP_DIR = "${OBJROOT}/Development.build/$(PROJECT_NAME).build/$(TARGET_NAME).build";
 				UNSTRIPPED_PRODUCT = YES;
+				ZERO_LINK = YES;
 			};
 			isa = PBXBuildStyle;
 			name = Development;
@@ -185,9 +222,11 @@
 			);
 			buildSettings = {
 				DEBUGGING_SYMBOLS = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				OPTIMIZATION_CFLAGS = "-Os";
 				OTHER_LDFLAGS = "\U0001-prebind";
 				TEMP_DIR = "${OBJROOT}/Deployment.build/$(PROJECT_NAME).build/$(TARGET_NAME).build";
+				ZERO_LINK = NO;
 			};
 			isa = PBXBuildStyle;
 			name = Deployment;
@@ -200,6 +239,7 @@
 			isa = PBXGroup;
 			name = Generic;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537552F016C376E01DC9062 = {
 			children = (
@@ -231,6 +271,7 @@
 			isa = PBXGroup;
 			name = Headers;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375530016C376E01DC9062 = {
 			children = (
@@ -314,6 +355,7 @@
 			isa = PBXGroup;
 			name = Source;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375531016C376E01DC9062 = {
 			children = (
@@ -323,6 +365,7 @@
 			isa = PBXGroup;
 			name = Resources;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375532016C376E01DC9062 = {
 			children = (
@@ -335,35 +378,46 @@
 			isa = PBXGroup;
 			name = "Resource Manager Resources";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375533016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.rez;
 			path = tkAboutDlg.r;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375535016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.rez;
 			path = tkMacOSXCursors.r;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375538016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.rez;
 			path = tkMacOSXMenu.r;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537553A016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.rez;
 			path = tkMacOSXXCursors.r;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537553B016C376E01DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = image.icns;
 			path = Wish.icns;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537553C016C376E01DC9062 = {
 			children = (
@@ -373,6 +427,7 @@
 			isa = PBXGroup;
 			name = "MacOS X";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537553D016C376E01DC9062 = {
 			children = (
@@ -387,54 +442,70 @@
 			isa = PBXGroup;
 			name = Headers;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537553E016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = tkMacOSX.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537553F016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = tkMacOSXDebug.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375540016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = tkMacOSXDefault.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375541016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = tkMacOSXEvent.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375542016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = tkMacOSXInt.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375543016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = tkMacOSXPort.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375545016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			path = tkMacOSXWm.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375546016C376E01DC9062 = {
 			children = (
 				F5375548016C376E01DC9062,
 				F5375549016C376E01DC9062,
 				F537554A016C376E01DC9062,
+				4C8A204405E0421900C18A82,
 				F537554B016C376E01DC9062,
 				F537554C016C376E01DC9062,
 				F537554D016C376E01DC9062,
@@ -466,858 +537,1111 @@
 			isa = PBXGroup;
 			name = Source;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375548016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXAppInit.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375549016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXBitmap.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537554A016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXButton.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537554B016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXClipboard.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537554C016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXColor.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537554D016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXConfig.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537554E016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXCursor.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537554F016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXDebug.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375550016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXDialog.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375551016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXDraw.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375552016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXEmbed.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375553016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXEvent.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375554016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXFont.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375555016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXHLEvents.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375556016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXInit.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375557016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXKeyboard.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375558016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXKeyEvent.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375559016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXMenu.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537555A016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXMenubutton.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537555B016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXMenus.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537555C016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXMouseEvent.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537555D016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXNotify.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537555E016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXRegion.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375560016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXScrlbr.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375561016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXSend.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375562016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXSubwindows.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375563016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXTest.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375565016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXWindowEvent.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375567016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXWm.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375568016C376E01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			path = tkMacOSXXStubs.c;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375569016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = default.h;
 			path = ../generic/default.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537556A016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = ks_names.h;
 			path = ../generic/ks_names.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537556B016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tk.h;
 			path = ../generic/tk.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537556C016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tk3d.h;
 			path = ../generic/tk3d.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537556D016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkButton.h;
 			path = ../generic/tkButton.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537556E016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkCanvas.h;
 			path = ../generic/tkCanvas.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537556F016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkColor.h;
 			path = ../generic/tkColor.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375570016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkDecls.h;
 			path = ../generic/tkDecls.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375571016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkFileFilter.h;
 			path = ../generic/tkFileFilter.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375572016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkFont.h;
 			path = ../generic/tkFont.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375573016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkInitScript.h;
 			path = ../generic/tkInitScript.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375574016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkInt.h;
 			path = ../generic/tkInt.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375575016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkIntDecls.h;
 			path = ../generic/tkIntDecls.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375576016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkIntPlatDecls.h;
 			path = ../generic/tkIntPlatDecls.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375577016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkIntXlibDecls.h;
 			path = ../generic/tkIntXlibDecls.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375578016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkMenu.h;
 			path = ../generic/tkMenu.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375579016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkMenubutton.h;
 			path = ../generic/tkMenubutton.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537557A016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkPlatDecls.h;
 			path = ../generic/tkPlatDecls.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537557B016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkPort.h;
 			path = ../generic/tkPort.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537557C016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkScale.h;
 			path = ../generic/tkScale.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537557D016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkScrollbar.h;
 			path = ../generic/tkScrollbar.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537557E016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkSelect.h;
 			path = ../generic/tkSelect.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537557F016C37A601DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkText.h;
 			path = ../generic/tkText.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375580016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tk3d.c;
 			path = ../generic/tk3d.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375581016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkArgv.c;
 			path = ../generic/tkArgv.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375582016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkAtom.c;
 			path = ../generic/tkAtom.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375583016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkBind.c;
 			path = ../generic/tkBind.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375584016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkBitmap.c;
 			path = ../generic/tkBitmap.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375585016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkButton.c;
 			path = ../generic/tkButton.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375586016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkCanvArc.c;
 			path = ../generic/tkCanvArc.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375587016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkCanvas.c;
 			path = ../generic/tkCanvas.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375588016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkCanvBmap.c;
 			path = ../generic/tkCanvBmap.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375589016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkCanvImg.c;
 			path = ../generic/tkCanvImg.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537558A016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkCanvLine.c;
 			path = ../generic/tkCanvLine.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537558B016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkCanvPoly.c;
 			path = ../generic/tkCanvPoly.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537558C016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkCanvPs.c;
 			path = ../generic/tkCanvPs.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537558D016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkCanvText.c;
 			path = ../generic/tkCanvText.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537558E016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkCanvUtil.c;
 			path = ../generic/tkCanvUtil.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537558F016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkCanvWind.c;
 			path = ../generic/tkCanvWind.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375590016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkClipboard.c;
 			path = ../generic/tkClipboard.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375591016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkCmds.c;
 			path = ../generic/tkCmds.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375592016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkColor.c;
 			path = ../generic/tkColor.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375593016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkConfig.c;
 			path = ../generic/tkConfig.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375594016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkConsole.c;
 			path = ../generic/tkConsole.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375595016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkCursor.c;
 			path = ../generic/tkCursor.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375596016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkEntry.c;
 			path = ../generic/tkEntry.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375597016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkError.c;
 			path = ../generic/tkError.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375598016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkEvent.c;
 			path = ../generic/tkEvent.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375599016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkFileFilter.c;
 			path = ../generic/tkFileFilter.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537559A016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkFocus.c;
 			path = ../generic/tkFocus.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537559B016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkFont.c;
 			path = ../generic/tkFont.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537559C016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkFrame.c;
 			path = ../generic/tkFrame.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537559D016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkGC.c;
 			path = ../generic/tkGC.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537559E016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkGeometry.c;
 			path = ../generic/tkGeometry.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537559F016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkGet.c;
 			path = ../generic/tkGet.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755A0016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkGrab.c;
 			path = ../generic/tkGrab.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755A1016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkGrid.c;
 			path = ../generic/tkGrid.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755A2016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkImage.c;
 			path = ../generic/tkImage.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755A3016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkImgBmap.c;
 			path = ../generic/tkImgBmap.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755A4016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkImgGIF.c;
 			path = ../generic/tkImgGIF.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755A5016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkImgPhoto.c;
 			path = ../generic/tkImgPhoto.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755A6016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkImgPPM.c;
 			path = ../generic/tkImgPPM.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755A7016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkImgUtil.c;
 			path = ../generic/tkImgUtil.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755A8016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkListbox.c;
 			path = ../generic/tkListbox.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755A9016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkMacWinMenu.c;
 			path = ../generic/tkMacWinMenu.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755AA016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkMain.c;
 			path = ../generic/tkMain.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755AB016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkMenu.c;
 			path = ../generic/tkMenu.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755AC016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkMenubutton.c;
 			path = ../generic/tkMenubutton.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755AD016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkMenuDraw.c;
 			path = ../generic/tkMenuDraw.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755AE016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkMessage.c;
 			path = ../generic/tkMessage.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755AF016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkObj.c;
 			path = ../generic/tkObj.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755B0016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkOldConfig.c;
 			path = ../generic/tkOldConfig.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755B1016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkOption.c;
 			path = ../generic/tkOption.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755B2016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkPack.c;
 			path = ../generic/tkPack.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755B3016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkPlace.c;
 			path = ../generic/tkPlace.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755B4016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkPointer.c;
 			path = ../generic/tkPointer.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755B5016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkRectOval.c;
 			path = ../generic/tkRectOval.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755B6016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkScale.c;
 			path = ../generic/tkScale.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755B7016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkScrollbar.c;
 			path = ../generic/tkScrollbar.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755B8016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkSelect.c;
 			path = ../generic/tkSelect.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755B9016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkStubImg.c;
 			path = ../generic/tkStubImg.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755BA016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkStubInit.c;
 			path = ../generic/tkStubInit.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755BB016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkStubLib.c;
 			path = ../generic/tkStubLib.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755BC016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkTest.c;
 			path = ../generic/tkTest.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755BD016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkText.c;
 			path = ../generic/tkText.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755BE016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkTextBTree.c;
 			path = ../generic/tkTextBTree.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755BF016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkTextDisp.c;
 			path = ../generic/tkTextDisp.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755C0016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkTextImage.c;
 			path = ../generic/tkTextImage.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755C1016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkTextIndex.c;
 			path = ../generic/tkTextIndex.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755C2016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkTextMark.c;
 			path = ../generic/tkTextMark.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755C3016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkTextTag.c;
 			path = ../generic/tkTextTag.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755C4016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkTextWind.c;
 			path = ../generic/tkTextWind.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755C5016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkTrig.c;
 			path = ../generic/tkTrig.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755C6016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkUtil.c;
 			path = ../generic/tkUtil.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755C7016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkVisual.c;
 			path = ../generic/tkVisual.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755C8016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkWindow.c;
 			path = ../generic/tkWindow.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755C9016C389901DC9062 = {
 			children = (
@@ -1327,20 +1651,25 @@
 			isa = PBXGroup;
 			name = Unix;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F53755CA016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkUnix3d.c;
 			path = ../unix/tkUnix3d.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755CB016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkUnixScale.c;
 			path = ../unix/tkUnixScale.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755CC016C389901DC9062 = {
 			children = (
@@ -1350,6 +1679,7 @@
 			isa = PBXGroup;
 			name = "X Emulation";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F53755CD016C389901DC9062 = {
 			children = (
@@ -1366,69 +1696,88 @@
 			isa = PBXGroup;
 			name = Headers;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F53755CE016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = xbytes.h;
 			path = ../xlib/xbytes.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755CF016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = cursorfont.h;
 			path = ../xlib/X11/cursorfont.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755D0016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = keysym.h;
 			path = ../xlib/X11/keysym.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755D1016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = keysymdef.h;
 			path = ../xlib/X11/keysymdef.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755D2016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = X.h;
 			path = ../xlib/X11/X.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755D3016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = Xatom.h;
 			path = ../xlib/X11/Xatom.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755D4016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = Xfuncproto.h;
 			path = ../xlib/X11/Xfuncproto.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755D5016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = Xlib.h;
 			path = ../xlib/X11/Xlib.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755D6016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = Xutil.h;
 			path = ../xlib/X11/Xutil.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755D7016C389901DC9062 = {
 			children = (
@@ -1441,41 +1790,52 @@
 			isa = PBXGroup;
 			name = Source;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F53755D8016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = xcolors.c;
 			path = ../xlib/xcolors.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755D9016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = xdraw.c;
 			path = ../xlib/xdraw.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755DA016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = xgc.c;
 			path = ../xlib/xgc.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755DB016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = ximage.c;
 			path = ../xlib/ximage.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755DC016C389901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = xutil.c;
 			path = ../xlib/xutil.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F53755DD016C38D201DC9062 = {
 			children = (
@@ -1486,11 +1846,15 @@
 			isa = PBXGroup;
 			name = Products;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F53755DE016C38D201DC9062 = {
+			explicitFileType = wrapper.framework;
+			fallbackIsa = PBXFileReference;
 			isa = PBXFrameworkReference;
 			path = Tk.framework;
 			refType = 3;
+			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		F53755DF016C38D201DC9062 = {
 			buildPhases = (
@@ -1750,6 +2114,7 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 				F55BC46902B2D38B01DC9062,
 				F5BFE58D02F8C41501DC9062,
 				F5BFE58E02F8C41501DC9062,
+				4C8A204505E0421900C18A82,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2687,12 +3052,16 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 			isa = PBXGroup;
 			name = "External Frameworks";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F537567D016C3ADB01DC9062 = {
+			fallbackIsa = PBXFileReference;
 			isa = PBXFrameworkReference;
+			lastKnownFileType = wrapper.framework;
 			name = Carbon.framework;
 			path = /System/Library/Frameworks/Carbon.framework;
 			refType = 0;
+			sourceTree = "<absolute>";
 		};
 		F537567E016C3ADB01DC9062 = {
 			fileRef = F537567D016C3ADB01DC9062;
@@ -2740,66 +3109,87 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 			isa = PBXGroup;
 			name = Bitmaps;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5375689016C3F1001DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = image.bmp;
 			name = error.bmp;
 			path = ../bitmaps/error.bmp;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537568A016C3F1001DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = image.bmp;
 			name = gray12.bmp;
 			path = ../bitmaps/gray12.bmp;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537568B016C3F1001DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = image.bmp;
 			name = gray25.bmp;
 			path = ../bitmaps/gray25.bmp;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537568C016C3F1001DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = image.bmp;
 			name = gray50.bmp;
 			path = ../bitmaps/gray50.bmp;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537568D016C3F1001DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = image.bmp;
 			name = gray75.bmp;
 			path = ../bitmaps/gray75.bmp;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537568E016C3F1001DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = image.bmp;
 			name = hourglass.bmp;
 			path = ../bitmaps/hourglass.bmp;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F537568F016C3F1001DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = image.bmp;
 			name = info.bmp;
 			path = ../bitmaps/info.bmp;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375690016C3F1001DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = image.bmp;
 			name = questhead.bmp;
 			path = ../bitmaps/questhead.bmp;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375691016C3F1001DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = image.bmp;
 			name = question.bmp;
 			path = ../bitmaps/question.bmp;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375692016C3F1001DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = image.bmp;
 			name = warning.bmp;
 			path = ../bitmaps/warning.bmp;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5375693016C3F1001DC9062 = {
 			fileRef = F5375689016C3F1001DC9062;
@@ -2868,9 +3258,12 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 			};
 		};
 		F537569F016C4DD401DC9062 = {
+			explicitFileType = wrapper.application;
+			fallbackIsa = PBXFileReference;
 			isa = PBXApplicationReference;
 			path = "Wish Shell.app";
 			refType = 3;
+			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		F53756A0016C4DD401DC9062 = {
 			buildPhases = (
@@ -3053,6 +3446,7 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 		F53756B2016C525F01DC9062 = {
 			isa = PBXTargetDependency;
 			target = F53755DF016C38D201DC9062;
+			targetProxy = 4C8A204105E041E800C18A82;
 		};
 		F548F8C80313C9E0016F146B = {
 			buildActionMask = 2147483647;
@@ -3118,9 +3512,12 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 			productReference = F548F8CF0313CEF0016F146B;
 		};
 		F548F8CF0313CEF0016F146B = {
+			explicitFileType = "compiled.mach-o.dylib";
+			fallbackIsa = PBXFileReference;
 			isa = PBXLibraryReference;
 			path = libtkstub8.5.a;
 			refType = 3;
+			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		F548F8D00313CF11016F146B = {
 			fileRef = F53755B9016C389901DC9062;
@@ -3137,16 +3534,13 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 		F548F8D20313CF93016F146B = {
 			isa = PBXTargetDependency;
 			target = F548F8CE0313CEF0016F146B;
+			targetProxy = 4C8A204005E041E800C18A82;
 		};
 		F55A164E032A11B1016F146B = {
 			buildActionMask = 2147483647;
 			files = (
 			);
-			generatedFileNames = (
-			);
 			isa = PBXShellScriptBuildPhase;
-			neededFileNames = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "if [ -n \"${EMBEDDED_BUILD:-}\" ]; then\ncd \"${TARGET_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents\"\n\n# if we are embedding frameworks, copy them into the app\nrm -rf \"Frameworks\"\nmkdir -p \"Frameworks\"\nif [ \"${DEPLOYMENT_LOCATION:-}\" = \"YES\" -o \"${ACTION}\" = \"install\" ]; then\n    FWKDIR=\"${INSTALL_ROOT}${DYLIB_INSTALL_PATH}\"\nelse\n    FWKDIR=\"${TARGET_BUILD_DIR}\"\nfi\ncp -fpRPH \"${FWKDIR}/Tcl.framework\" \"Frameworks\"\ncp -fpRPH \"${FWKDIR}/Tk.framework\" \"Frameworks\"\n\n# fix install names when embedding\nfix_install_id ( ) {\n    chmod -RH a+w \"$1\"\n    install_name_tool -id $(otool -L \"$1\" | awk \"/$(basename \"$1\")\\.framework.*[^:]\\$/ {sub(\\\"^.*/Frameworks\\\",\\\"@executable_path/../Frameworks\\\",\\$1); print \\$1}\") \"$1\"\n    chmod -RH a-w \"$1\"   \n}\nfix_install_name ( ) {\n    chmod -RH a+w \"$1\"\n    install_name_tool -change $(otool -L \"$1\" | awk \"/$2\\.framework.*[^:]\\$/ {print \\$1; sub(\\\"^.*/Frameworks\\\",\\\"@executable_path/../Frameworks\\\",\\$1); print \\$1}\") \"$1\"\n    chmod -RH a-w \"$1\"   \n}\nfix_install_id Frameworks/Tcl.framework/Tcl\nfix_install_id Frameworks/Tk.framework/Tk\nfix_install_name Frameworks/Tk.framework/Tk Tcl\nfix_install_name \"MacOS/${PRODUCT_NAME}\" Tcl\nfix_install_name \"MacOS/${PRODUCT_NAME}\" Tk\n\nfi";
@@ -3154,9 +3548,11 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 		F55BC46802B2D38B01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkPanedWindow.c;
 			path = ../generic/tkPanedWindow.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F55BC46902B2D38B01DC9062 = {
 			fileRef = F55BC46802B2D38B01DC9062;
@@ -3166,9 +3562,11 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 		};
 		F55BC46A02B2D3F301DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = panedwindow.tcl;
 			path = ../library/panedwindow.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F55BC46B02B2D3F301DC9062 = {
 			fileRef = F55BC46A02B2D3F301DC9062;
@@ -3177,10 +3575,13 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 			};
 		};
 		F5875C7B016FEF1D01DC9062 = {
+			fallbackIsa = PBXFileReference;
 			isa = PBXFrameworkReference;
+			lastKnownFileType = wrapper.framework;
 			name = Tcl.framework;
 			path = ../tcl/Tcl.framework;
 			refType = 3;
+			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 		F5875C7D016FEF1D01DC9062 = {
 			fileRef = F5875C7B016FEF1D01DC9062;
@@ -3192,11 +3593,7 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 			buildActionMask = 8;
 			files = (
 			);
-			generatedFileNames = (
-			);
 			isa = PBXShellScriptBuildPhase;
-			neededFileNames = (
-			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = /bin/sh;
 			shellScript = "# ensure we can overwrite a previous install\nif [ -d \"${INSTALL_ROOT}${INSTALL_PATH}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}\" ]; then\n    chmod -RH u+w \"${INSTALL_ROOT}${INSTALL_PATH}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}\"\nfi";
@@ -3205,11 +3602,7 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 			buildActionMask = 8;
 			files = (
 			);
-			generatedFileNames = (
-			);
 			isa = PBXShellScriptBuildPhase;
-			neededFileNames = (
-			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = /bin/sh;
 			shellScript = "# ensure we can overwrite a previous install\nif [ -d \"${INSTALL_ROOT}${INSTALL_PATH}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}\" ]; then\n    chmod -RH u+w \"${INSTALL_ROOT}${INSTALL_PATH}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}\"\nfi";
@@ -3230,11 +3623,7 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 			buildActionMask = 8;
 			files = (
 			);
-			generatedFileNames = (
-			);
 			isa = PBXShellScriptBuildPhase;
-			neededFileNames = (
-			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = /bin/sh;
 			shellScript = "# redo prebinding\ncd \"${INSTALL_ROOT}/\"\nif [ ! -d usr/lib ]; then mkdir -p usr; ln -fs /usr/lib usr/; RM_USRLIB=1; fi\nif [ ! -d System ]; then ln -fs /System .; RM_SYSTEM=1; fi\nif [ ! -d Library/Frameworks/Tcl.framework ]; then ln -fs ${TCL_FRAMEWORK_DIR}/Tcl.framework Library/Frameworks; RM_TCL=1; fi\nredo_prebinding -r . \"./${INSTALL_PATH}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\"\nif [ -n \"${RM_USRLIB:-}\" ]; then rm -f usr/lib; rmdir -p usr 2>&-; fi\nif [ -n \"${RM_SYSTEM:-}\" ]; then rm -f System; fi\nif [ -n \"${RM_TCL:-}\" ]; then rm -f Library/Frameworks/Tcl.framework; fi\n\n# fix permissions on uninstalled products\nchmod a+w \"${TEMP_ROOT}/UninstalledProducts\"\nchmod a+w \"${TEMP_ROOT}\"/UninstalledProducts/libtkstub*.a";
@@ -3243,11 +3632,7 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 			buildActionMask = 8;
 			files = (
 			);
-			generatedFileNames = (
-			);
 			isa = PBXShellScriptBuildPhase;
-			neededFileNames = (
-			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = /bin/sh;
 			shellScript = "# redo prebinding\ncd \"${INSTALL_ROOT}/\"\nAPP_DIR=\"${PRODUCT_NAME}.${WRAPPER_EXTENSION}\"\nEXECUTABLE_DIR=\"${APP_DIR}/Contents/MacOS\"\nEXECUTABLE=\"${EXECUTABLE_DIR}/${PRODUCT_NAME}\"\nFWK_RSRC_DIR=\"${DYLIB_INSTALL_PATH}/Tk.framework/Versions/${FRAMEWORK_VERSION}/Resources\"\nif [ -z \"${EMBEDDED_BUILD:-}\" ]; then\n    if [ ! -d usr/lib ]; then mkdir -p usr; ln -fs /usr/lib usr/; RM_USRLIB=1; fi\n    if [ ! -d System ]; then ln -fs /System .; RM_SYSTEM=1; fi\n    if [ ! -d Library/Frameworks/Tcl.framework ]; then ln -fs ${TCL_FRAMEWORK_DIR}/Tcl.framework Library/Frameworks; RM_TCL=1; fi\n    PREBIND_OPTS=\"-r .\"\nfi\nredo_prebinding ${PREBIND_OPTS:-} -e \"./${INSTALL_PATH}/${EXECUTABLE_DIR}\" \"./${INSTALL_PATH}/${EXECUTABLE}\"\nif [ -n \"${RM_USRLIB:-}\" ]; then rm -f usr/lib; rmdir -p usr 2>&-; fi\nif [ -n \"${RM_SYSTEM:-}\" ]; then rm -f System; fi\nif [ -n \"${RM_TCL:-}\" ]; then rm -f Library/Frameworks/Tcl.framework; fi\n\n# copy Wish.app into framework, install wish script & symbolic link\nif [ -z \"${EMBEDDED_BUILD:-}\" ]; then\nrm -rf \"./${FWK_RSRC_DIR}/${APP_DIR}\"\ncp -fpRPH \"./${INSTALL_PATH}/${APP_DIR}\" \"./${FWK_RSRC_DIR}\"\nmkdir -p \"./${BINDIR}\"\nrm -f \"./${BINDIR}/wish${FRAMEWORK_VERSION}\"\ncat > \"./${BINDIR}/wish${FRAMEWORK_VERSION}\" <<EOF\n#!/bin/sh\n\"\\$(dirname \\$0)$(echo ${BINDIR} | sed -e 's#/[^/][^/]*#/..#g')${FWK_RSRC_DIR}/${EXECUTABLE}\" \"\\$@\"\nEOF\nchmod a+x \"./${BINDIR}/wish${FRAMEWORK_VERSION}\"\nln -fs \"wish${FRAMEWORK_VERSION}\" \"./${BINDIR}/wish\"\nfi";
@@ -3256,11 +3641,7 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 			buildActionMask = 2147483647;
 			files = (
 			);
-			generatedFileNames = (
-			);
 			isa = PBXShellScriptBuildPhase;
-			neededFileNames = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "if [ \"${BUILD_STYLE}\" = \"Development\" ]; then\n\t# force Deployment build to be relinked next time\n\tif [ -f \"${OBJROOT}/Deployment.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\" ]; then\n\t    touch -t `date -r \\`expr \\\\\\`date +\"%s\"\\\\\\` + 30\\` +\"%Y%m%d%H%M.%S\"` \"${OBJROOT}/Deployment.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\"\n\tfi\nelse\n\t# force Development build to be relinked next time\n\tif [ -f \"${OBJROOT}/Development.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\" ]; then\n\t    touch -t `date -r \\`expr \\\\\\`date +\"%s\"\\\\\\` + 30\\` +\"%Y%m%d%H%M.%S\"` \"${OBJROOT}/Development.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\"\n\tfi\nfi";
@@ -3489,16 +3870,20 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 		F5BFE58B02F8C41501DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkStyle.c;
 			path = ../generic/tkStyle.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5BFE58C02F8C41501DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
 			name = tkUndo.c;
 			path = ../generic/tkUndo.c;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5BFE58D02F8C41501DC9062 = {
 			fileRef = F5BFE58B02F8C41501DC9062;
@@ -3515,9 +3900,11 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 		F5BFE58F02F8C45B01DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
 			name = tkUndo.h;
 			path = ../generic/tkUndo.h;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5BFE59002F8C45B01DC9062 = {
 			fileRef = F5BFE58F02F8C45B01DC9062;
@@ -3529,20 +3916,18 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 			buildActionMask = 12;
 			files = (
 			);
-			generatedFileNames = (
-			);
 			isa = PBXShellScriptBuildPhase;
-			neededFileNames = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "# synthesize tkConfig.sh via buildTkConfig.tcl script\nexport DYLD_FRAMEWORK_PATH=\"${TCL_FRAMEWORK_DIR}\"\nTCLSH=\"${TCLSH_DIR}/tclsh${FRAMEWORK_VERSION}\"\nif [ ! -e \"${TCLSH}\" ]; then TCLSH=\"/bin/sh\"; fi\n\"${TCLSH}\" \"${SRCROOT}/buildTkConfig.tcl\" \"${TCL_FRAMEWORK_DIR}/Tcl.${WRAPPER_EXTENSION}/tclConfig.sh\" \"${SRCROOT}/../unix/tkConfig.sh.in\" \"${TARGET_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Versions/${FRAMEWORK_VERSION}/tkConfig.sh\"";
 		};
 		F5C2EA33034D71B2016F146B = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = mkpsenc.tcl;
 			path = ../library/mkpsenc.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5C2EA35034D7212016F146B = {
 			fileRef = F5C2EA33034D71B2016F146B;
@@ -3558,18 +3943,23 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 			isa = PBXGroup;
 			name = "Header Tools";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5C8865A017D625C01DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = tk.decls;
 			path = ../generic/tk.decls;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5C8865B017D625C01DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = tkInt.decls;
 			path = ../generic/tkInt.decls;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF07A7016CD03801DC9062 = {
 			children = (
@@ -3609,200 +3999,260 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 			isa = PBXGroup;
 			name = Scripts;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F5DF0928016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = bgerror.tcl;
 			path = ../library/bgerror.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF0929016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = button.tcl;
 			path = ../library/button.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF092A016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = choosedir.tcl;
 			path = ../library/choosedir.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF092B016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = clrpick.tcl;
 			path = ../library/clrpick.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF092C016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = comdlg.tcl;
 			path = ../library/comdlg.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF092D016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = console.tcl;
 			path = ../library/console.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF092E016CD3F901DC9062 = {
+			fallbackIsa = PBXFileReference;
 			includeInIndex = 0;
 			isa = PBXFolderReference;
+			lastKnownFileType = folder;
 			name = demos;
 			path = ../library/demos;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF092F016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = dialog.tcl;
 			path = ../library/dialog.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF0930016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = entry.tcl;
 			path = ../library/entry.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF0931016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = focus.tcl;
 			path = ../library/focus.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF0932016CD3F901DC9062 = {
+			fallbackIsa = PBXFileReference;
 			includeInIndex = 0;
 			isa = PBXFolderReference;
+			lastKnownFileType = folder;
 			name = images;
 			path = ../library/images;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF0933016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = listbox.tcl;
 			path = ../library/listbox.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF0934016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = menu.tcl;
 			path = ../library/menu.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF0935016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = msgbox.tcl;
 			path = ../library/msgbox.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF0936016CD3F901DC9062 = {
+			fallbackIsa = PBXFileReference;
 			includeInIndex = 0;
 			isa = PBXFolderReference;
+			lastKnownFileType = folder;
 			name = msgs;
 			path = ../library/msgs;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF0937016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = obsolete.tcl;
 			path = ../library/obsolete.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF0938016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = optMenu.tcl;
 			path = ../library/optMenu.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF0939016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = palette.tcl;
 			path = ../library/palette.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF093A016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = prolog.ps;
 			path = ../generic/prolog.ps;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF093B016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = safetk.tcl;
 			path = ../library/safetk.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF093C016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = scale.tcl;
 			path = ../library/scale.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF093D016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = scrlbar.tcl;
 			path = ../library/scrlbar.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF093E016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = spinbox.tcl;
 			path = ../library/spinbox.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF093F016CD3F901DC9062 = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = tclIndex;
 			path = ../library/tclIndex;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF0940016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = tearoff.tcl;
 			path = ../library/tearoff.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF0941016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = text.tcl;
 			path = ../library/text.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF0942016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = tk.tcl;
 			path = ../library/tk.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF0943016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = tkfbox.tcl;
 			path = ../library/tkfbox.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF0944016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = unsupported.tcl;
 			path = ../library/unsupported.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5DF0945016CD3F901DC9062 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = xmfbox.tcl;
 			path = ../library/xmfbox.tcl;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F5EEA7050324680B016F146B = {
 			buildActionMask = 2147483647;
 			files = (
 			);
-			generatedFileNames = (
-			);
 			isa = PBXShellScriptBuildPhase;
-			neededFileNames = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "if [ \"${BUILD_STYLE}\" = \"Development\" ]; then\n\t# force Deployment build to be relinked next time\n\tif [ -f \"${OBJROOT}/Deployment.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\" ]; then\n\t    touch -t `date -r \\`expr \\\\\\`date +\"%s\"\\\\\\` + 30\\` +\"%Y%m%d%H%M.%S\"` \"${OBJROOT}/Deployment.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\"\n\tfi\nelse\n\t# force Development build to be relinked next time\n\tif [ -f \"${OBJROOT}/Development.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\" ]; then\n\t    touch -t `date -r \\`expr \\\\\\`date +\"%s\"\\\\\\` + 30\\` +\"%Y%m%d%H%M.%S\"` \"${OBJROOT}/Development.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\"\n\tfi\nfi\n# create symbolic link to Tcl.framework if necessary\ncd \"${SYMROOT}\"\nif [ ! -e Tcl.framework -o -L Tcl.framework ]; then\n\trm -f Tcl.framework && ln -s \"${TCL_FRAMEWORK_DIR}/Tcl.framework\" .\nfi";
@@ -3820,19 +4270,17 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 		F92ED9910403D0F0006F146B = {
 			fileEncoding = 5;
 			isa = PBXFileReference;
+			lastKnownFileType = text;
 			name = ChangeLog;
 			path = ../ChangeLog;
 			refType = 2;
+			sourceTree = SOURCE_ROOT;
 		};
 		F9A61D2F04C2C861006F5A0B = {
 			buildActionMask = 8;
 			files = (
 			);
-			generatedFileNames = (
-			);
 			isa = PBXShellScriptBuildPhase;
-			neededFileNames = (
-			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = /bin/sh;
 			shellScript = "if [ -z \"${EMBEDDED_BUILD:-}\" ]; then\n# build html documentation\nif [ \"${BUILD_STYLE}\" = \"Deployment\" ]; then\n\texport DYLD_FRAMEWORK_PATH=\"${TCL_FRAMEWORK_DIR}\"\n\tif [ -e \"${TCL_FRAMEWORK_DIR}/Deployment/Makefile\" ]; then\n\t\tcd \"${TCL_FRAMEWORK_DIR}/Deployment\"\n\t\texport DYLD_FRAMEWORK_PATH=\"${TCL_FRAMEWORK_DIR}\"\n\t\tgnumake html-tk DISTDIR=\"${INSTALL_ROOT}${DOCDIR}\" TCL_EXE=\"${TCLSH_DIR}/tclsh${FRAMEWORK_VERSION}\"\n\t\tcd \"${INSTALL_ROOT}${DOCDIR}\"\n\t\tln -fs contents.htm html/${PRODUCT_NAME}TOC.html\n\t\trm -fr \"${PRODUCT_NAME}\"; mv -f html \"${PRODUCT_NAME}\"\n\telse\n\t\techo \"Couldn't build html documentation!\"\n\tfi\nfi\nfi";