From 0dc2e89b80549a1b01b88aa601b97a9430759b10 Mon Sep 17 00:00:00 2001 From: wolfsuit Date: Mon, 16 Feb 2004 00:19:41 +0000 Subject: 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. --- ChangeLog | 54 +++- macosx/Wish.pbproj/jingham.pbxuser | 590 ++++++++++++++++++++++++++++++++++++- macosx/Wish.pbproj/project.pbxproj | 530 ++++++++++++++++++++++++++++++--- macosx/tkMacOSXAppInit.c | 4 +- macosx/tkMacOSXButton.c | 78 +++-- macosx/tkMacOSXCarbonEvents.c | 128 ++++++++ macosx/tkMacOSXClipboard.c | 13 +- macosx/tkMacOSXDebug.c | 32 +- macosx/tkMacOSXDialog.c | 43 ++- macosx/tkMacOSXDraw.c | 10 +- macosx/tkMacOSXEvent.c | 16 +- macosx/tkMacOSXFont.c | 20 +- macosx/tkMacOSXHLEvents.c | 7 +- macosx/tkMacOSXInit.c | 7 +- macosx/tkMacOSXInt.h | 8 +- macosx/tkMacOSXKeyEvent.c | 2 +- macosx/tkMacOSXMenu.c | 20 +- macosx/tkMacOSXMenubutton.c | 88 +++--- macosx/tkMacOSXMouseEvent.c | 35 ++- macosx/tkMacOSXNotify.c | 10 +- macosx/tkMacOSXScale.c | 30 +- macosx/tkMacOSXScrlbr.c | 6 +- macosx/tkMacOSXSubwindows.c | 6 +- macosx/tkMacOSXWindowEvent.c | 2 +- macosx/tkMacOSXWm.c | 10 +- 25 files changed, 1485 insertions(+), 264 deletions(-) create mode 100644 macosx/tkMacOSXCarbonEvents.c diff --git a/ChangeLog b/ChangeLog index f8a707e..d912e73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,18 +1,50 @@ +2004-02-15 Jim Ingham + + * tkMacOSXDialog.c (MatchOneType): If the Macintosh filetype + is 0, then automatically pass the fileType check. + + * tkMacOSXCarbonEvents.c: New file - this doesn't do anything + yet - just registers for a couple of App Events. + + * tkMacOSXInit.c (TkpInit.c): Call TkMacOSXInitCarbonEvents.c. + + * tkMacOSXAppInit.c: Formatting cleanups. + * tkMacOSXButton.c: Ditto + * tkMacOSXClipboard.c: Ditto + * tkMacOSXDebug.c: Ditto + * tkMacOSXDialog.c: Ditto + * tkMacOSXDraw.c: Ditto + * tkMacOSXEvent.c: Ditto + * tkMacOSXFont.c: Ditto + * tkMacOSXHLEvents.c: Ditto + * tkMacOSXInit.c: Ditto + * tkMacOSXInt.h + * tkMacOSXKeyEvent.c: Ditto + * tkMacOSXMenu.c: Ditto + * tkMacOSXMenubutton.c: Ditto + * tkMacOSXMouseEvent.c: Ditto + * tkMacOSXNotify.c: Ditto + * tkMacOSXScale.c: Ditto + * tkMacOSXScrlbr.c: Ditto + * tkMacOSXSubwindows.c: Ditto + * tkMacOSXWindowEvent.c: Ditto + * tkMacOSXWm.c: Ditto + 2004-02-13 Jim Ingham - * tkMacOSXDialog.c (Tk_GetOpenFileObjCmd): Use CFStringRef for - title & message options, not pascal strings. - (Tk_GetSaveFileObjCmd): Ditto - (Tk_ChooseDirectoryObjCmd): Ditto - (NavServicesGetFile): Now that we get CFStrings, we don't need - to convert them here. + * tkMacOSXDialog.c (Tk_GetOpenFileObjCmd): Use CFStringRef for + title & message options, not pascal strings. + (Tk_GetSaveFileObjCmd): Ditto + (Tk_ChooseDirectoryObjCmd): Ditto + (NavServicesGetFile): Now that we get CFStrings, we don't need + to convert them here. - * tkMacOSXMenu.c (TkMacOSXDispatchMenuEvent): Cleanup, we don't - need to handle the Apple Menu picks any more, but the code didn't - reflect that. + * tkMacOSXMenu.c (TkMacOSXDispatchMenuEvent): Cleanup, we don't + need to handle the Apple Menu picks any more, but the code didn't + reflect that. - * tkMacOSXWm.c (TkSetWMName): Use CFStrings for the Window Title - name, not Pascal strings. + * tkMacOSXWm.c (TkSetWMName): Use CFStrings for the Window Title + name, not Pascal strings. 2004-02-12 Jeff Hobbs 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 = ""; + }; + }, + { + 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 = ""; + }; + }, + { + 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 = ""; + }; + }, + { + 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 = ""; + }; + }, + { + 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 = ""; + }; + }, + ); + 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 = ""; }; 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 = ""; + }; + 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 = ""; }; 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 = ""; }; 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 = ""; }; F537552F016C376E01DC9062 = { children = ( @@ -231,6 +271,7 @@ isa = PBXGroup; name = Headers; refType = 4; + sourceTree = ""; }; F5375530016C376E01DC9062 = { children = ( @@ -314,6 +355,7 @@ isa = PBXGroup; name = Source; refType = 4; + sourceTree = ""; }; F5375531016C376E01DC9062 = { children = ( @@ -323,6 +365,7 @@ isa = PBXGroup; name = Resources; refType = 4; + sourceTree = ""; }; F5375532016C376E01DC9062 = { children = ( @@ -335,35 +378,46 @@ isa = PBXGroup; name = "Resource Manager Resources"; refType = 4; + sourceTree = ""; }; F5375533016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.rez; path = tkAboutDlg.r; refType = 4; + sourceTree = ""; }; F5375535016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.rez; path = tkMacOSXCursors.r; refType = 4; + sourceTree = ""; }; F5375538016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.rez; path = tkMacOSXMenu.r; refType = 4; + sourceTree = ""; }; F537553A016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.rez; path = tkMacOSXXCursors.r; refType = 4; + sourceTree = ""; }; F537553B016C376E01DC9062 = { isa = PBXFileReference; + lastKnownFileType = image.icns; path = Wish.icns; refType = 4; + sourceTree = ""; }; F537553C016C376E01DC9062 = { children = ( @@ -373,6 +427,7 @@ isa = PBXGroup; name = "MacOS X"; refType = 4; + sourceTree = ""; }; F537553D016C376E01DC9062 = { children = ( @@ -387,54 +442,70 @@ isa = PBXGroup; name = Headers; refType = 4; + sourceTree = ""; }; 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 = ""; }; F5375548016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXAppInit.c; refType = 4; + sourceTree = ""; }; F5375549016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXBitmap.c; refType = 4; + sourceTree = ""; }; F537554A016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXButton.c; refType = 4; + sourceTree = ""; }; F537554B016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXClipboard.c; refType = 4; + sourceTree = ""; }; F537554C016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXColor.c; refType = 4; + sourceTree = ""; }; F537554D016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXConfig.c; refType = 4; + sourceTree = ""; }; F537554E016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXCursor.c; refType = 4; + sourceTree = ""; }; F537554F016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXDebug.c; refType = 4; + sourceTree = ""; }; F5375550016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXDialog.c; refType = 4; + sourceTree = ""; }; F5375551016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXDraw.c; refType = 4; + sourceTree = ""; }; F5375552016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXEmbed.c; refType = 4; + sourceTree = ""; }; F5375553016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXEvent.c; refType = 4; + sourceTree = ""; }; F5375554016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXFont.c; refType = 4; + sourceTree = ""; }; F5375555016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXHLEvents.c; refType = 4; + sourceTree = ""; }; F5375556016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXInit.c; refType = 4; + sourceTree = ""; }; F5375557016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXKeyboard.c; refType = 4; + sourceTree = ""; }; F5375558016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXKeyEvent.c; refType = 4; + sourceTree = ""; }; F5375559016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXMenu.c; refType = 4; + sourceTree = ""; }; F537555A016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXMenubutton.c; refType = 4; + sourceTree = ""; }; F537555B016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXMenus.c; refType = 4; + sourceTree = ""; }; F537555C016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXMouseEvent.c; refType = 4; + sourceTree = ""; }; F537555D016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXNotify.c; refType = 4; + sourceTree = ""; }; F537555E016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXRegion.c; refType = 4; + sourceTree = ""; }; F5375560016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXScrlbr.c; refType = 4; + sourceTree = ""; }; F5375561016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXSend.c; refType = 4; + sourceTree = ""; }; F5375562016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXSubwindows.c; refType = 4; + sourceTree = ""; }; F5375563016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXTest.c; refType = 4; + sourceTree = ""; }; F5375565016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXWindowEvent.c; refType = 4; + sourceTree = ""; }; F5375567016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXWm.c; refType = 4; + sourceTree = ""; }; F5375568016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; path = tkMacOSXXStubs.c; refType = 4; + sourceTree = ""; }; 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 = ""; }; 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 = ""; }; F53755CD016C389901DC9062 = { children = ( @@ -1366,69 +1696,88 @@ isa = PBXGroup; name = Headers; refType = 4; + sourceTree = ""; }; 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 = ""; }; 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 = ""; }; 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 <jingham@apple.com> & Ian Reid, Copyright F55BC46902B2D38B01DC9062, F5BFE58D02F8C41501DC9062, F5BFE58E02F8C41501DC9062, + 4C8A204505E0421900C18A82, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -2687,12 +3052,16 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright isa = PBXGroup; name = "External Frameworks"; refType = 4; + sourceTree = ""; }; F537567D016C3ADB01DC9062 = { + fallbackIsa = PBXFileReference; isa = PBXFrameworkReference; + lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; refType = 0; + sourceTree = ""; }; F537567E016C3ADB01DC9062 = { fileRef = F537567D016C3ADB01DC9062; @@ -2740,66 +3109,87 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright isa = PBXGroup; name = Bitmaps; refType = 4; + sourceTree = ""; }; 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 <jingham@apple.com> & 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 <jingham@apple.com> & Ian Reid, Copyright F53756B2016C525F01DC9062 = { isa = PBXTargetDependency; target = F53755DF016C38D201DC9062; + targetProxy = 4C8A204105E041E800C18A82; }; F548F8C80313C9E0016F146B = { buildActionMask = 2147483647; @@ -3118,9 +3512,12 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & 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 <jingham@apple.com> & 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 <jingham@apple.com> & 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 <jingham@apple.com> & 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 <jingham@apple.com> & 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 <jingham@apple.com> & 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 <jingham@apple.com> & 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 <jingham@apple.com> & 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 <jingham@apple.com> & 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}\" < #include @@ -133,7 +133,7 @@ main(argc, argv) } #endif - textEncoding=GetApplicationTextEncoding(); + textEncoding = GetApplicationTextEncoding(); /* * Now add the scripts folder to the auto_path. diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c index 80dbb23..31cdb46 100644 --- a/macosx/tkMacOSXButton.c +++ b/macosx/tkMacOSXButton.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXButton.c,v 1.7 2003/10/10 20:19:51 hobbs Exp $ + * RCS: @(#) $Id: tkMacOSXButton.c,v 1.8 2004/02/16 00:19:41 wolfsuit Exp $ */ #include "tkButton.h" @@ -149,16 +149,16 @@ TkpCreateButton( macButtonPtr = (MacButton *) ckalloc(sizeof(MacButton)); Tk_CreateEventHandler(tkwin, ActivateMask, ButtonEventProc, (ClientData) macButtonPtr); - macButtonPtr->id=bCount++; - macButtonPtr->usingControl=0; - macButtonPtr->flags=0; - macButtonPtr->userPaneBackground.red=0; - macButtonPtr->userPaneBackground.green=0; - macButtonPtr->userPaneBackground.blue=~0; - macButtonPtr->userPane=NULL; - macButtonPtr->control=NULL; - macButtonPtr->controlTitle[0]= - macButtonPtr->controlTitle[1]=0; + macButtonPtr->id = bCount++; + macButtonPtr->usingControl = 0; + macButtonPtr->flags = 0; + macButtonPtr->userPaneBackground.red = 0; + macButtonPtr->userPaneBackground.green = 0; + macButtonPtr->userPaneBackground.blue = ~0; + macButtonPtr->userPane = NULL; + macButtonPtr->control = NULL; + macButtonPtr->controlTitle[0] = 0; + macButtonPtr->controlTitle[1] = 0; macButtonPtr->picParams.version = -2; macButtonPtr->picParams.hRes = 0x00480000; macButtonPtr->picParams.vRes = 0x00480000; @@ -222,15 +222,15 @@ TkpDisplayButton( wasUsingControl = macButtonPtr->usingControl; if (TkMacOSXComputeDrawParams(butPtr, &drawParams) ) { - macButtonPtr->usingControl=1; + macButtonPtr->usingControl = 1; if (butPtr->type == TYPE_BUTTON) { macButtonPtr->useTkText = 0; } else { macButtonPtr->useTkText = 1; } } else { - macButtonPtr->usingControl=0; - macButtonPtr->useTkText=1; + macButtonPtr->usingControl = 0; + macButtonPtr->useTkText = 1; } /* @@ -821,14 +821,14 @@ TkMacOSXInitControl ( * Set up the user pane */ - initiallyVisible=false; - initialValue=kControlSupportsEmbedding| + initiallyVisible = false; + initialValue = kControlSupportsEmbedding| kControlHasSpecialBackground; - minValue=0; - maxValue=1; - procID=kControlUserPaneProc; - controlReference=(SInt32)mbPtr; - mbPtr->userPane=NewControl(mbPtr->windowRef, + minValue = 0; + maxValue = 1; + procID = kControlUserPaneProc; + controlReference = (SInt32)mbPtr; + mbPtr->userPane = NewControl(mbPtr->windowRef, paneRect, "\p", initiallyVisible, initialValue, @@ -842,7 +842,7 @@ TkMacOSXInitControl ( return 1; } - if ((status=EmbedControl(mbPtr->userPane,rootControl))!=noErr) { + if ((status=EmbedControl(mbPtr->userPane,rootControl)) != noErr) { fprintf(stderr,"Failed to embed user pane control %d\n", status); return 1; } @@ -850,9 +850,9 @@ TkMacOSXInitControl ( SetUserPaneSetUpSpecialBackgroundProc(mbPtr->userPane, UserPaneBackgroundProc); SetUserPaneDrawProc(mbPtr->userPane,UserPaneDraw); - initiallyVisible=false; + initiallyVisible = false; TkMacOSXComputeControlParams(butPtr,&mbPtr->params); - mbPtr->control=NewControl(mbPtr->windowRef, + mbPtr->control = NewControl(mbPtr->windowRef, cntrRect, "\p", initiallyVisible, mbPtr->params.initialValue, @@ -871,7 +871,7 @@ TkMacOSXInitControl ( return 1; } - mbPtr->flags|=(1 + 2); + mbPtr->flags |= (1 + 2); return 0; } @@ -909,28 +909,26 @@ TkMacOSXDrawControl( TkWindow * winPtr; Rect paneRect; Rect cntrRect; - int hilitePart = -1; - - winPtr=(TkWindow *)butPtr->tkwin; + winPtr = (TkWindow *)butPtr->tkwin; paneRect.left = winPtr->privatePtr->xOff; paneRect.top = winPtr->privatePtr->yOff; paneRect.right = paneRect.left + Tk_Width(butPtr->tkwin); paneRect.bottom = paneRect.top + Tk_Height(butPtr->tkwin); - cntrRect=paneRect; + cntrRect = paneRect; /* - cntrRect.left+=butPtr->inset; - cntrRect.top+=butPtr->inset; - cntrRect.right-=butPtr->inset; - cntrRect.bottom-=butPtr->inset; + cntrRect.left += butPtr->inset; + cntrRect.top += butPtr->inset; + cntrRect.right -= butPtr->inset; + cntrRect.bottom -= butPtr->inset; */ - cntrRect.left+=DEF_INSET_LEFT; - cntrRect.top+=DEF_INSET_TOP; - cntrRect.right-=DEF_INSET_RIGHT; - cntrRect.bottom-=DEF_INSET_BOTTOM; + cntrRect.left += DEF_INSET_LEFT; + cntrRect.top += DEF_INSET_TOP; + cntrRect.right -= DEF_INSET_RIGHT; + cntrRect.bottom -= DEF_INSET_BOTTOM; /* * The control has been previously initialised @@ -1139,7 +1137,7 @@ SetupBevelButton( ClosePicture(); tkPictureIsOpen = 0; - if ( (err=SetControlData(controlHandle, kControlButtonPart, + if ((err = SetControlData(controlHandle, kControlButtonPart, kControlBevelButtonContentTag, sizeof(ControlButtonContentInfo), (char *) &mbPtr->bevelButtonContent)) != noErr ) { @@ -1167,7 +1165,7 @@ SetupBevelButton( theAlignment = kControlBevelButtonAlignCenter; } - if ((err=SetControlData(controlHandle, kControlButtonPart, + if ((err = SetControlData(controlHandle, kControlButtonPart, kControlBevelButtonGraphicAlignTag, sizeof(ControlButtonGraphicAlignment), (char *) &theAlignment)) != noErr ) { @@ -1187,7 +1185,7 @@ SetupBevelButton( } else if (butPtr->compound == COMPOUND_RIGHT) { thePlacement = kControlBevelButtonPlaceToLeftOfGraphic; } - if ((err=SetControlData(controlHandle, kControlButtonPart, + if ((err = SetControlData(controlHandle, kControlButtonPart, kControlBevelButtonTextPlaceTag, sizeof(ControlButtonTextPlacement), (char *) &thePlacement)) != noErr ) { diff --git a/macosx/tkMacOSXCarbonEvents.c b/macosx/tkMacOSXCarbonEvents.c new file mode 100644 index 0000000..c80ed61 --- /dev/null +++ b/macosx/tkMacOSXCarbonEvents.c @@ -0,0 +1,128 @@ +/* + * tkMacOSXCarbonEvents.c -- + * + * This file implements functions that register for and handle + * various Carbon Events. + * + * Copyright 2001, Apple Computer, Inc. + * + * The following terms apply to all files originating from Apple + * Computer, Inc. ("Apple") and associated with the software + * unless explicitly disclaimed in individual files. + * + * + * Apple hereby grants permission to use, copy, modify, + * distribute, and license this software and its documentation + * for any purpose, provided that existing copyright notices are + * retained in all copies and that this notice is included + * verbatim in any distributions. No written agreement, license, + * or royalty fee is required for any of the authorized + * uses. Modifications to this software may be copyrighted by + * their authors and need not follow the licensing terms + * described here, provided that the new terms are clearly + * indicated on the first page of each file where they apply. + * + * + * IN NO EVENT SHALL APPLE, THE AUTHORS OR DISTRIBUTORS OF THE + * SOFTWARE BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, + * INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF + * THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF, + * EVEN IF APPLE OR THE AUTHORS HAVE BEEN ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. APPLE, THE AUTHORS AND + * DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS + * SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND APPLE,THE + * AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE + * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + * + * GOVERNMENT USE: If you are acquiring this software on behalf + * of the U.S. government, the Government shall have only + * "Restricted Rights" in the software and related documentation + * as defined in the Federal Acquisition Regulations (FARs) in + * Clause 52.227.19 (c) (2). If you are acquiring the software + * on behalf of the Department of Defense, the software shall be + * classified as "Commercial Computer Software" and the + * Government shall have only "Restricted Rights" as defined in + * Clause 252.227-7013 (c) (1) of DFARs. Notwithstanding the + * foregoing, the authors grant the U.S. Government and others + * acting in its behalf permission to use and distribute the + * software in accordance with the terms specified in this + * license. + */ + +#include "tkInt.h" +#include "tkMacOSXInt.h" + +static EventHandlerRef ApplicationCarbonEventHandler; + +/* Definitions of functions used only in this file */ +static OSStatus AppEventHandlerProc ( + EventHandlerCallRef callRef, + EventRef inEvent, + void *userData); + + +/* + *---------------------------------------------------------------------- + * + * AppEventHandlerProc -- + * + * This procedure is the Application CarbonEvent + * handler. + * + * Results: + * None. + * + * Side effects: + * Dispatches CarbonEvents. + * + *---------------------------------------------------------------------- + */ + +static OSStatus +AppEventHandlerProc ( + EventHandlerCallRef callRef, + EventRef inEvent, + void *userData) +{ + return eventNotHandledErr; +} + +/* + *---------------------------------------------------------------------- + * + * TkMacOSXInitCarbonEvents -- + * + * This procedure initializes the Application CarbonEvent + * handler. + * + * Results: + * None. + * + * Side effects: + * A handler for Application targeted Carbon Events is registered. + * + *---------------------------------------------------------------------- + */ + +void +TkMacOSXInitCarbonEvents ( + Tcl_Interp *interp) +{ + EventTypeSpec inList[1]; + + InstallEventHandler(GetApplicationEventTarget(), + NewEventHandlerUPP(AppEventHandlerProc), + 0, NULL, NULL, &ApplicationCarbonEventHandler); + + inList[0].eventClass = kEventClassWindow; + inList[0].eventKind = kEventWindowExpanded; + AddEventTypesToHandler (ApplicationCarbonEventHandler, 1, inList); + + inList[0].eventClass = kEventClassWindow; + inList[0].eventKind = kEventWindowCollapsed; + AddEventTypesToHandler (ApplicationCarbonEventHandler, 1, inList); + +} + diff --git a/macosx/tkMacOSXClipboard.c b/macosx/tkMacOSXClipboard.c index 76bf710..941e7ad 100644 --- a/macosx/tkMacOSXClipboard.c +++ b/macosx/tkMacOSXClipboard.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXClipboard.c,v 1.4 2003/11/11 18:21:48 hobbs Exp $ + * RCS: @(#) $Id: tkMacOSXClipboard.c,v 1.5 2004/02/16 00:19:42 wolfsuit Exp $ */ #include "tkInt.h" @@ -66,7 +66,7 @@ TkSelGetSelection( * Get the scrap from the Macintosh global clipboard. */ - err=GetCurrentScrap(&scrapRef); + err = GetCurrentScrap(&scrapRef); if (err != noErr) { Tcl_AppendResult(interp, Tk_GetAtomName(tkwin, selection), " GetCurrentScrap failed.", (char *) NULL); @@ -340,10 +340,11 @@ TkSuspendClipboard() ClearCurrentScrap(); GetCurrentScrap(&scrapRef); - Tcl_UtfToExternalDString(TkMacOSXCarbonEncoding, buffer, - length, &encodedText); - PutScrapFlavor(scrapRef, 'TEXT', 0, Tcl_DStringLength(&encodedText), - Tcl_DStringValue(&encodedText)); + Tcl_UtfToExternalDString(TkMacOSXCarbonEncoding, buffer, + length, &encodedText); + PutScrapFlavor(scrapRef, 'TEXT', 0, + Tcl_DStringLength(&encodedText), + Tcl_DStringValue(&encodedText) ); Tcl_DStringFree(&encodedText); /* diff --git a/macosx/tkMacOSXDebug.c b/macosx/tkMacOSXDebug.c index 53997e8..674d5a3 100644 --- a/macosx/tkMacOSXDebug.c +++ b/macosx/tkMacOSXDebug.c @@ -260,7 +260,7 @@ CarbonEventToAscii(EventRef eventRef, char * buf) strcat(buf, " "); buf += strlen(buf); while (list->names && (!names) ) { - if (eventClass==list->c) { + if (eventClass == list->c) { names = list -> names; } else { list++; @@ -269,9 +269,9 @@ CarbonEventToAscii(EventRef eventRef, char * buf) if (names) { found = 0; while (names->name && !found) { - if (eventKind==names->kind) { + if (eventKind == names->kind) { sprintf(buf, "%-20s", names->name); - found=1; + found = 1; } else { names++; } @@ -302,11 +302,11 @@ char * CarbonEventKindToAscii(EventRef eventRef, char * buf ) } } if (names) { - found=0; + found = 0; while ( names->name && !found ) { - if (eventKind==names->kind) { + if (eventKind == names->kind) { sprintf(buf,"%s",names->name); - found=1; + found = 1; } else { names++; } @@ -326,17 +326,17 @@ char * ClassicEventToAscii(EventRecord * eventPtr, char * buf ) int found = 0; names = classicEventNames; while ( names -> name && !found ) - if (eventPtr->what==names->kind) { + if (eventPtr->what == names->kind) { int * iPtr; char cBuf[8]; - iPtr=( int *)&cBuf; + iPtr=(int *) &cBuf; *iPtr = eventPtr->message; cBuf[4] = 0; sprintf(buf, "%-16s %08x %04x %s", names->name, (int) eventPtr->message, eventPtr->modifiers, cBuf); - found=1; + found = 1; } else { names++; } @@ -358,8 +358,8 @@ void printPoint(char * tag, Point * p ) void printRect(char * tag, Rect * r ) { fprintf(stderr,"%s %4d %4d %4d %4d (%dx%d)\n", - tag,r->left,r->top,r->right,r->bottom, - r->right-r->left+1,r->bottom-r->top+1 ); + tag, r->left, r->top, r->right, r->bottom, + r->right - r->left + 1, r->bottom - r->top + 1); } void printRegion(char * tag, RgnHandle rgn ) @@ -373,7 +373,7 @@ void printWindowTitle(char * tag, WindowRef window ) { Str255 title; GetWTitle(window,title); - title [ title[0] + 1 ] = 0; + title [title[0] + 1] = 0; fprintf(stderr, "%s %s\n", tag, title +1 ); } @@ -402,7 +402,7 @@ TkMacOSXMenuMessageToAscii(int msg, char * s) { MsgName * msgNamePtr; for (msgNamePtr = msgNames;msgNamePtr->name;) { - if (msgNamePtr->msg==msg) { + if (msgNamePtr->msg == msg) { strcpy(s,msgNamePtr->name); return s; } else { @@ -428,9 +428,9 @@ char * MouseTrackingResultToAscii(MouseTrackingResult r, char * buf) { -1, NULL } }; MsgName * namePtr; - for (namePtr=trackingNames;namePtr->name;namePtr++) { - if (namePtr->msg==r) { - strcpy(buf,namePtr->name); + for (namePtr = trackingNames; namePtr->name; namePtr++) { + if (namePtr->msg == r) { + strcpy(buf, namePtr->name); return buf; } } diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c index f917fdc..9f3a9e0 100644 --- a/macosx/tkMacOSXDialog.c +++ b/macosx/tkMacOSXDialog.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.7 2004/02/14 01:26:49 wolfsuit Exp $ + * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.8 2004/02/16 00:19:42 wolfsuit Exp $ */ #include @@ -869,7 +869,7 @@ NavServicesGetFile( * Most commands assume that the file dialogs return a single * item, not a list. So only build a list if multiple is true... */ - if (err==noErr) { + if (err == noErr) { if (multiple) { theResult = Tcl_NewListObj(0, NULL); } else { @@ -879,7 +879,7 @@ NavServicesGetFile( err = memFullErr; } } - if (theReply.validRecord && err==noErr) { + if (theReply.validRecord && err == noErr) { AEDesc resultDesc; long count; Tcl_DString fileName; @@ -974,7 +974,7 @@ NavServicesGetFile( if (menuItemNames) { int i; - for (i=0;i < ofdPtr->fl.numFilters;i++) { + for (i = 0;i < ofdPtr->fl.numFilters; i++) { CFRelease(menuItemNames[i]); } ckfree((void *)menuItemNames); @@ -1033,7 +1033,6 @@ OpenFileFilterProc( &uniFileName, NULL, NULL); if (err == noErr) { - int numChars; Tcl_UniCharToUtfDString ( (Tcl_UniChar *) uniFileName.unicode, uniFileName.length, @@ -1130,7 +1129,7 @@ OpenEventProc( static Boolean MatchOneType( StringPtr fileNamePtr, /* Name of the file */ - OSType fileType, /* Type of the file */ + OSType fileType, /* Type of the file, 0 means there was no specified type. */ OpenFileData * ofdPtr, /* Information about this file dialog */ FileFilter * filterPtr) /* Match the file described by pb against * this filter */ @@ -1154,7 +1153,8 @@ MatchOneType( * considered an error. */ - for (clausePtr=filterPtr->clauses; clausePtr; clausePtr=clausePtr->next) { + for (clausePtr = filterPtr->clauses; clausePtr; + clausePtr = clausePtr->next) { int macMatched = 0; int globMatched = 0; GlobPattern * globPtr; @@ -1167,7 +1167,8 @@ MatchOneType( macMatched = 1; } - for (globPtr=clausePtr->patterns; globPtr; globPtr=globPtr->next) { + for (globPtr = clausePtr->patterns; globPtr; + globPtr = globPtr->next) { char *q, *ext; if (fileNamePtr == NULL) { @@ -1180,7 +1181,8 @@ MatchOneType( * We don't want any extensions: OK if the filename doesn't * have "." in it */ - for (q=fileNamePtr; *q; q++) { + + for (q = fileNamePtr; *q; q++) { if (*q == '.') { goto glob_unmatched; } @@ -1202,14 +1204,24 @@ MatchOneType( break; } - for (mfPtr=clausePtr->macTypes; mfPtr; mfPtr=mfPtr->next) { + for (mfPtr = clausePtr->macTypes; mfPtr; mfPtr = mfPtr->next) { if (fileType == mfPtr->type) { macMatched = 1; break; } } - if (globMatched && macMatched) { + /* + * On Mac OS X, it is not uncommon for files to have NO + * file type. But folks with Tcl code on Classic MacOS pretty + * much assume that a generic file will have type TEXT. So + * if we were strict about matching types when the source file + * had NO type set, they would have to add another rule always + * with no fileType. To avoid that, we pass the macMatch side + * of the test if no fileType is set. + */ + + if (globMatched && (macMatched || (fileType == 0))) { return MATCHED; } } @@ -1247,7 +1259,7 @@ TkAboutDlg() return; } - windowRef=GetDialogWindow(aboutDlog); + windowRef = GetDialogWindow(aboutDlog); SelectWindow(windowRef); while (itemHit != 1) { @@ -1450,7 +1462,7 @@ Tk_MessageBoxObjCmd( result = TCL_ERROR; goto end; } - haveParentOption= true; + haveParentOption = true; break; case ALERT_TITLE: @@ -1553,8 +1565,9 @@ Tk_MessageBoxObjCmd( data.windowRef = windowRef; data.buttonIndex = 1; handler = NewEventHandlerUPP( AlertHandler ); - InstallEventHandler( notifyTarget, handler, GetEventTypeCount(kEvents), - &kEvents, &data, NULL ); + InstallEventHandler(notifyTarget, handler, + GetEventTypeCount(kEvents), + kEvents, &data, NULL ); osError = ShowSheetWindow( GetDialogWindow(dialogRef), windowRef ); if(osError != noErr) { result = TCL_ERROR; diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c index 3edcfe9..144b04c 100644 --- a/macosx/tkMacOSXDraw.c +++ b/macosx/tkMacOSXDraw.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXDraw.c,v 1.2 2002/08/31 06:12:29 das Exp $ + * RCS: @(#) $Id: tkMacOSXDraw.c,v 1.3 2004/02/16 00:19:42 wolfsuit Exp $ */ #include "tkInt.h" @@ -289,8 +289,8 @@ XCopyPlane( * Case 2: transparent bitmaps. If it's color we ignore * the forecolor. */ - pm=GetPortPixMap(srcPort); - if (GetPixDepth(pm)== 1) { + pm = GetPortPixMap(srcPort); + if (GetPixDepth(pm) == 1) { tmode = srcOr; } else { tmode = transparent; @@ -453,7 +453,7 @@ XFillRectangles( Drawable d, /* Draw on this. */ GC gc, /* Use this GC. */ XRectangle *rectangles, /* Rectangle array. */ - int n_rectangels) /* Number of rectangles. */ + int n_rectangles) /* Number of rectangles. */ { MacDrawable *macWin = (MacDrawable *) d; CGrafPtr saveWorld; @@ -472,7 +472,7 @@ XFillRectangles( TkMacOSXSetUpGraphicsPort(gc, destPort); - for (i=0; ixOff + rectangles[i].x); theRect.top = (short) (macWin->yOff + rectangles[i].y); theRect.right = (short) (theRect.left + rectangles[i].width); diff --git a/macosx/tkMacOSXEvent.c b/macosx/tkMacOSXEvent.c index e426a8a..d343e99 100644 --- a/macosx/tkMacOSXEvent.c +++ b/macosx/tkMacOSXEvent.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXEvent.c,v 1.4 2003/09/30 23:26:09 wolfsuit Exp $ + * RCS: @(#) $Id: tkMacOSXEvent.c,v 1.5 2004/02/16 00:19:42 wolfsuit Exp $ */ #include @@ -69,7 +69,7 @@ tkMacOSXFlushWindows () if (QDIsPortBuffered(portPtr)) { QDFlushPortBuffer(portPtr, NULL); } - wRef=GetNextWindow(wRef); + wRef = GetNextWindow(wRef); } } @@ -143,8 +143,8 @@ TkMacOSXProcessAppleEvent(TkMacOSXEvent * eventPtr, MacEventStatus * statusPtr) EventRecord eventRecord; if (ConvertEventRefToEventRecord(eventPtr->eventRef, &eventRecord )) { - err=TkMacOSXDoHLEvent(&eventRecord); - if (err!=noErr) { + err = TkMacOSXDoHLEvent(&eventRecord); + if (err != noErr) { char buf1 [ 256 ]; char buf2 [ 256 ]; fprintf(stderr, @@ -253,7 +253,7 @@ ReceiveAndProcessEvent() * into this routine, and are guaranteed to have one waiting. */ - err=ReceiveNextEvent(0, NULL, kEventDurationNoWait, + err = ReceiveNextEvent(0, NULL, kEventDurationNoWait, true, &macEvent.eventRef); if (err != noErr) { return err; @@ -264,10 +264,10 @@ ReceiveAndProcessEvent() TkMacOSXProcessEvent(&macEvent,&eventStatus); if (!eventStatus.stopProcessing) { if (!targetRef) { - targetRef=GetEventDispatcherTarget(); + targetRef = GetEventDispatcherTarget(); } - err= SendEventToEventTarget(macEvent.eventRef,targetRef); + err = SendEventToEventTarget(macEvent.eventRef,targetRef); if (err != noErr #if !TK_MAC_DEBUG && err != eventNotHandledErr @@ -275,7 +275,7 @@ ReceiveAndProcessEvent() ) { fprintf(stderr, "RCNE SendEventToEventTarget (%s) failed, %d\n", - CarbonEventToAscii(macEvent.eventRef,buf ),err); + CarbonEventToAscii(macEvent.eventRef, buf),err); } } ReleaseEvent(macEvent.eventRef); diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c index 082e7b2..3d9ee87 100644 --- a/macosx/tkMacOSXFont.c +++ b/macosx/tkMacOSXFont.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXFont.c,v 1.4 2004/01/13 02:06:01 davygrvy Exp $ + * RCS: @(#) $Id: tkMacOSXFont.c,v 1.5 2004/02/16 00:19:42 wolfsuit Exp $ */ #include @@ -1166,7 +1166,7 @@ TkMacOSXIsCharacterMissing( fm.device = 0; fm.numer.h = fm.numer.v = fm.denom.h = fm.denom.v = 1; - fmOutPtr=FMSwapFont(&fm); + fmOutPtr = FMSwapFont(&fm); fprintf(stderr,"fmOut %08x, handle %08x\n", (int)fmOutPtr, fmOutPtr->fontHandle); #if !defined(UNIVERSAL_INTERFACES_VERSION) || (UNIVERSAL_INTERFACES_VERSION < 0x0300) @@ -1749,13 +1749,13 @@ FontMapLoadPage( * For some reason, FMSwapFont alywas returns a structure where the returned font handle * is NULL. Until we figure this one out, assume all characters are allowed */ - fmOut=FMSwapFont(&fm); - fHandle=fmOut->fontHandle; - isMultiByteFont=subFontPtr->familyPtr->isMultiByteFont; + fmOut = FMSwapFont(&fm); + fHandle = fmOut->fontHandle; + isMultiByteFont = subFontPtr->familyPtr->isMultiByteFont; #ifndef MAC_OSX_TK GetResInfo(fHandle, &theID, &theType, theName); fprintf ( stderr, "ResError() %d, %x\n", ResError (), fHandle ); - if (theType=='sfnt') { + if (theType == 'sfnt') { #endif /* * Found an outline font which has very complex font record. @@ -2086,7 +2086,7 @@ GetUtfFaceName( return mapPtr->utfName; } } - Tcl_Panic("GetUtfFaceName: unexpected nativeName"); + panic("GetUtfFaceName: unexpected nativeName"); return NULL; } @@ -2241,7 +2241,7 @@ int TkMacOSXUseAntialiasedText(interp, enable) static UInt32 (*swaptextflags)(UInt32) = NULL; if(!initialized) { - NSSymbol nsSymbol=NULL; + NSSymbol nsSymbol = NULL; if(NSIsSymbolNameDefinedWithHint("_QDSwapTextFlags", "QD")) { nsSymbol = NSLookupAndBindSymbolWithHint("_QDSwapTextFlags", "QD"); } else if(NSIsSymbolNameDefinedWithHint("_SwapQDTextFlags", "QD")) { @@ -2267,9 +2267,9 @@ int TkMacOSXUseAntialiasedText(interp, enable) Tcl_ResetResult(interp); } } - if(swaptextflags) { + if (swaptextflags) { swaptextflags(enable ? kQDUseCGTextRendering | kQDUseCGTextMetrics - : kQDUseTrueTypeScalerGlyphs); + : kQDUseTrueTypeScalerGlyphs); TkMacOSXAntialiasedTextEnabled = enable; return TCL_OK; } else { diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c index 90821c7..efe42fb 100644 --- a/macosx/tkMacOSXHLEvents.c +++ b/macosx/tkMacOSXHLEvents.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXHLEvents.c,v 1.6 2003/03/12 05:56:21 wolfsuit Exp $ + * RCS: @(#) $Id: tkMacOSXHLEvents.c,v 1.7 2004/02/16 00:19:42 wolfsuit Exp $ */ #include "tkMacOSXPort.h" @@ -329,10 +329,11 @@ ScriptHandler (const AppleEvent * event, AppleEvent * reply, long handlerRefcon) else { AEGetDescData(&theDesc,data,size); data [ size ] = 0; - for (i=0; iwindow); + winPort = TkMacOSXGetDrawablePort(winPtr->window); if (!winPort) { return; } @@ -3457,7 +3457,8 @@ DrawMenuEntryLabel( tag = kATSUSizeTag; valueSize = sizeof(fixedSize); valuePtr = &fixedSize; - if ((err=ATSUSetAttributes(style, 1, &tag, &valueSize, &valuePtr))!= noErr) { + err = ATSUSetAttributes(style, 1, &tag, &valueSize, &valuePtr); + if (err != noErr) { fprintf(stderr,"ATSUSetAttributes failed,%d\n", err ); } @@ -3466,7 +3467,8 @@ DrawMenuEntryLabel( tag = kATSUFontTag; valueSize = sizeof(fontID); valuePtr = &fontID; - if ((err=ATSUSetAttributes(style, 1, &tag, &valueSize, &valuePtr))!= noErr) { + err = ATSUSetAttributes(style, 1, &tag, &valueSize, &valuePtr); + if (err != noErr) { fprintf(stderr,"ATSUSetAttributes failed,%d\n", err ); } @@ -3481,8 +3483,10 @@ DrawMenuEntryLabel( if (!stringRef) { fprintf(stderr,"CFStringCreateWithCString failed\n"); } - if ((err=ATSUCreateTextLayoutWithTextPtr(CFStringGetCharactersPtr(stringRef), 0, length, length, - 1, &runLengths, &style, &textLayout)) != noErr) { + err = ATSUCreateTextLayoutWithTextPtr(CFStringGetCharactersPtr(stringRef), + 0, length, length, + 1, &runLengths, &style, &textLayout) + if (err != noErr) { fprintf(stderr,"ATSUCreateTextLayoutWithTextPtr failed, %d\n", err); return; } @@ -3502,8 +3506,8 @@ DrawMenuEntryLabel( Tcl_UtfToExternalDString(TkMacOSXCarbonEncoding, Tcl_DStringValue(&itemTextDString), Tcl_DStringLength(&itemTextDString), &convertedTextDString); #ifdef USE_ATSU - xLocation = leftEdge<<16; - yLocation = baseline<<16; + xLocation = leftEdge << 16; + yLocation = baseline << 16; ATSUDrawText(textLayout,kATSUFromTextBeginning, kATSUToTextEnd, xLocation, yLocation); ATSUDisposeTextLayout(textLayout); CFRelease(stringRef); diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c index 52b239c..0acc021 100644 --- a/macosx/tkMacOSXMenubutton.c +++ b/macosx/tkMacOSXMenubutton.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXMenubutton.c,v 1.2 2002/08/31 06:12:30 das Exp $ + * RCS: @(#) $Id: tkMacOSXMenubutton.c,v 1.3 2004/02/16 00:19:42 wolfsuit Exp $ */ #include @@ -187,18 +187,18 @@ TkpDisplayMenuButton( SetGWorld(dstPort, NULL); TkMacOSXSetUpClippingRgn(Tk_WindowId(tkwin)); - winPtr=(TkWindow *)butPtr->tkwin; - paneRect.left=winPtr->privatePtr->xOff; - paneRect.top=winPtr->privatePtr->yOff; - paneRect.right=paneRect.left+Tk_Width(butPtr->tkwin)-1; - paneRect.bottom=paneRect.top+Tk_Height(butPtr->tkwin)-1; + winPtr = (TkWindow *)butPtr->tkwin; + paneRect.left = winPtr->privatePtr->xOff; + paneRect.top = winPtr->privatePtr->yOff; + paneRect.right = paneRect.left+Tk_Width(butPtr->tkwin)-1; + paneRect.bottom = paneRect.top+Tk_Height(butPtr->tkwin)-1; - cntrRect=paneRect; + cntrRect = paneRect; - cntrRect.left+=butPtr->inset; - cntrRect.top+=butPtr->inset; - cntrRect.right-=butPtr->inset; - cntrRect.bottom-=butPtr->inset; + cntrRect.left += butPtr->inset; + cntrRect.top += butPtr->inset; + cntrRect.right -= butPtr->inset; + cntrRect.bottom -= butPtr->inset; if (mbPtr->userPane) { MenuButtonControlParams params; @@ -246,7 +246,8 @@ TkpDisplayMenuButton( } if ((titleChanged||styleChanged) && titleParams .len) { if (hasImageOrBitmap) { - if ((err=SetControlFontStyle(mbPtr->control,&titleParams.style))!=noErr) { + err = SetControlFontStyle(mbPtr->control,&titleParams.style); + if (err !=noErr) { fprintf(stderr,"SetControlFontStyle failed %d\n", err); return; } @@ -284,10 +285,11 @@ TkpDisplayMenuButton( ClosePicture(); tkPictureIsOpen = 0; - if ( (err=SetControlData(mbPtr->control, kControlButtonPart, + err = SetControlData(mbPtr->control, kControlButtonPart, kControlBevelButtonContentTag, sizeof(ControlButtonContentInfo), - (char *) &mbPtr->bevelButtonContent)) != noErr ) { + (char *) &mbPtr->bevelButtonContent); + if (err != noErr) { fprintf(stderr,"SetControlData BevelButtonContent failed, %d\n", err ); } switch (butPtr->anchor) { @@ -320,10 +322,11 @@ TkpDisplayMenuButton( break; } - if ((err=SetControlData(mbPtr->control, kControlButtonPart, + err = SetControlData(mbPtr->control, kControlButtonPart, kControlBevelButtonGraphicAlignTag, sizeof(ControlButtonGraphicAlignment), - (char *) &theAlignment)) != noErr ) { + (char *) &theAlignment); + if (err != noErr ) { fprintf(stderr,"SetControlData BevelButtonGraphicAlign failed, %d\n", err ); } } @@ -449,7 +452,7 @@ TkpComputeMenuButtonGeometry(mbPtr) if (mbPtr->indicatorOn) { mm = WidthMMOfScreen(Tk_Screen(mbPtr->tkwin)); pixels = WidthOfScreen(Tk_Screen(mbPtr->tkwin)); - mbPtr->indicatorHeight= kTriangleHeight; + mbPtr->indicatorHeight = kTriangleHeight; mbPtr->indicatorWidth = kTriangleWidth + kTriangleMargin; width += mbPtr->indicatorWidth; } else { @@ -604,31 +607,32 @@ MenuButtonInitControl ( int length; Str255 itemText; - rootControl=TkMacOSXGetRootControl(Tk_WindowId(butPtr->tkwin)); - mbPtr->windowRef=GetWindowFromPort(TkMacOSXGetDrawablePort(Tk_WindowId(butPtr->tkwin))); + rootControl = TkMacOSXGetRootControl(Tk_WindowId(butPtr->tkwin)); + mbPtr->windowRef = GetWindowFromPort(TkMacOSXGetDrawablePort(Tk_WindowId(butPtr->tkwin))); /* * Set up the user pane */ initiallyVisible = false; initialValue = kControlSupportsEmbedding| - kControlHasSpecialBackground; + kControlHasSpecialBackground; minValue = 0; maxValue = 1; procID = kControlUserPaneProc; controlReference = (SInt32)mbPtr; - mbPtr->userPane=NewControl(mbPtr->windowRef, - paneRect, "\p", - initiallyVisible, - initialValue, - minValue, - maxValue, - procID, - controlReference ); + mbPtr->userPane = NewControl(mbPtr->windowRef, + paneRect, "\p", + initiallyVisible, + initialValue, + minValue, + maxValue, + procID, + controlReference ); if (!mbPtr->userPane) { fprintf(stderr,"Failed to create user pane control\n"); return 1; } - if ((status=EmbedControl(mbPtr->userPane,rootControl))!=noErr) { + status = EmbedControl(mbPtr->userPane,rootControl); + if (status != noErr) { fprintf(stderr,"Failed to embed user pane control %d\n", status); return 1; } @@ -651,7 +655,8 @@ MenuButtonInitControl ( fprintf(stderr,"failed to create control of type %d : line %d\n",mbPtr->params.procID, __LINE__); return 1; } - if ((err=EmbedControl(mbPtr->control,mbPtr->userPane)) != noErr ) { + err = EmbedControl(mbPtr->control,mbPtr->userPane); + if (err != noErr ) { fprintf(stderr,"failed to embed control of type %d,%d\n",procID, err); return 1; } @@ -662,35 +667,36 @@ MenuButtonInitControl ( SetControlTitleWithCFString(mbPtr->control, cf); CFRelease(cf); if (mbPtr->titleParams.len) { - if ((err=SetControlFontStyle(mbPtr->control,&mbPtr->titleParams.style))!=noErr) { + err = SetControlFontStyle(mbPtr->control,&mbPtr->titleParams.style); + if (err !=noErr) { fprintf(stderr,"SetControlFontStyle failed %d\n", err); return 1; } } } else { - CFStringRef cf; + CFStringRef cf; err = TkMacOSXGetNewMenuID(mbPtr->info.interp, (TkMenu *)mbPtr, 0, &menuID); if (err != TCL_OK) { return err; } length = strlen(Tk_PathName(mbPtr->info.tkwin)); memmove(&itemText[1], Tk_PathName(mbPtr->info.tkwin), - (length > 230) ? 230 : length); + (length > 230) ? 230 : length); itemText[0] = (length > 230) ? 230 : length; if (!(mbPtr->menuRef = NewMenu(menuID,itemText))) { return 1; } - cf = CFStringCreateWithCString(NULL, - mbPtr->titleParams.title, kCFStringEncodingUTF8); + cf = CFStringCreateWithCString(NULL, + mbPtr->titleParams.title, kCFStringEncodingUTF8); AppendMenuItemText(mbPtr->menuRef, "\px"); if (cf != NULL) { SetMenuItemTextWithCFString(mbPtr->menuRef, 1, cf); CFRelease(cf); } err = SetControlData(mbPtr->control, - kControlNoPart, - kControlPopupButtonMenuRefTag, - sizeof(mbPtr->menuRef), &mbPtr->menuRef); + kControlNoPart, + kControlPopupButtonMenuRefTag, + sizeof(mbPtr->menuRef), &mbPtr->menuRef); SetControlMinimum(mbPtr->control, 1); SetControlMaximum(mbPtr->control, 1); SetControlValue(mbPtr->control, 1); @@ -723,9 +729,9 @@ OSErr SetUserPaneDrawProc ( ControlUserPaneDrawUPP myControlUserPaneDrawUPP; myControlUserPaneDrawUPP = NewControlUserPaneDrawUPP(upp); return SetControlData (control, - kControlNoPart, kControlUserPaneDrawProcTag, - sizeof(myControlUserPaneDrawUPP), - (Ptr) &myControlUserPaneDrawUPP); + kControlNoPart, kControlUserPaneDrawProcTag, + sizeof(myControlUserPaneDrawUPP), + (Ptr) &myControlUserPaneDrawUPP); } /* diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c index 6a18426..150519c 100644 --- a/macosx/tkMacOSXMouseEvent.c +++ b/macosx/tkMacOSXMouseEvent.c @@ -156,12 +156,13 @@ TkMacOSXProcessMouseEvent(TkMacOSXEvent *eventPtr, MacEventStatus * statusPtr) medPtr->state |= Mod2Mask; /* option key */ } if (eventPtr->eKind == kEventMouseDown - || eventPtr->eKind== kEventMouseDragged ) { + || eventPtr->eKind == kEventMouseDragged ) { EventMouseButton mouseButton; - if ((status=GetEventParameter(eventPtr->eventRef, - kEventParamMouseButton, - typeMouseButton, NULL, - sizeof(mouseButton), NULL,&mouseButton)) != noErr ) { + status = GetEventParameter(eventPtr->eventRef, + kEventParamMouseButton, + typeMouseButton, NULL, + sizeof(mouseButton), NULL,&mouseButton); + if (status != noErr ) { fprintf (stderr, "Failed to retrieve mouse button, %d\n", status); statusPtr->err = 1; return 0; @@ -169,7 +170,7 @@ TkMacOSXProcessMouseEvent(TkMacOSXEvent *eventPtr, MacEventStatus * statusPtr) medPtr->state |= 1 << ((mouseButton-1)+8); } - medPtr->windowPart= FindWindow(where, &medPtr->whichWin); + medPtr->windowPart = FindWindow(where, &medPtr->whichWin); window = TkMacOSXGetXWindow(medPtr->whichWin); if (medPtr->whichWin != NULL && window == None) { return 0; @@ -193,10 +194,11 @@ TkMacOSXProcessMouseEvent(TkMacOSXEvent *eventPtr, MacEventStatus * statusPtr) window, medPtr->state); } if (eventPtr->eKind == kEventMouseWheelMoved) { - if ((status=GetEventParameter(eventPtr->eventRef, - kEventParamMouseWheelDelta, - typeLongInteger, NULL, - sizeof(medPtr->delta), NULL,&medPtr->delta)) != noErr ) { + status = GetEventParameter(eventPtr->eventRef, + kEventParamMouseWheelDelta, + typeLongInteger, NULL, + sizeof(medPtr->delta), NULL,&medPtr->delta); + if (status != noErr ) { fprintf (stderr, "Failed to retrieve mouse wheel delta, %d\n", status); statusPtr->err = 1; @@ -233,23 +235,26 @@ TkMacOSXProcessMouseEvent(TkMacOSXEvent *eventPtr, MacEventStatus * statusPtr) } } - if (medPtr->whichWin && eventPtr->eKind==kEventMouseDown) { + if (medPtr->whichWin && eventPtr->eKind == kEventMouseDown) { ProcessSerialNumber frontPsn, ourPsn; Boolean flag; - if ((err=GetFrontProcess(&frontPsn))!=noErr) { + err = GetFrontProcess(&frontPsn); + if (err != noErr) { fprintf(stderr, "GetFrontProcess failed, %d\n", err); statusPtr->err = 1; return 1; } GetCurrentProcess(&ourPsn); - if ((err=SameProcess(&frontPsn, &ourPsn, &flag))!=noErr) { + err = SameProcess(&frontPsn, &ourPsn, &flag); + if (err != noErr) { fprintf(stderr, "SameProcess failed, %d\n", err); statusPtr->err = 1; return 1; } else { if (!flag) { - if ((err=SetFrontProcess(&ourPsn)) != noErr) { + err = SetFrontProcess(&ourPsn); + if (err != noErr) { fprintf(stderr,"SetFrontProcess failed,%d\n", err); statusPtr->err = 1; return 1; @@ -484,7 +489,7 @@ HandleInCollapse(WindowRef win) static int GeneratePollingEvents(MouseEventData * medPtr) { - Tk_Window tkwin, rootwin, grabWin, topPtr; + Tk_Window tkwin, rootwin, grabWin; Window window; int local_x, local_y; TkDisplay *dispPtr; diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c index 4768c94..7ab74e0 100644 --- a/macosx/tkMacOSXNotify.c +++ b/macosx/tkMacOSXNotify.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXNotify.c,v 1.6 2004/01/13 02:06:01 davygrvy Exp $ + * RCS: @(#) $Id: tkMacOSXNotify.c,v 1.7 2004/02/16 00:19:42 wolfsuit Exp $ */ #include "tclInt.h" @@ -1155,11 +1155,11 @@ TkMacOSXCreateFakeEvent () EventTime eTime; EventRef eventRef; EventAttributes flags; - eClass=kEventClassWish; + eClass = kEventClassWish; eKind = 0xffff; - eTime =GetLastUserEventTime() + 0.001; - flags=kEventAttributeUserEvent; - if (CreateEvent(NULL,eClass,eKind,eTime,flags,&eventRef)!=noErr) { + eTime = GetLastUserEventTime() + 0.001; + flags = kEventAttributeUserEvent; + if (CreateEvent(NULL,eClass,eKind,eTime,flags,&eventRef) != noErr) { fprintf(stderr,"CreateEvent failed\n"); return NULL; } diff --git a/macosx/tkMacOSXScale.c b/macosx/tkMacOSXScale.c index 3c00610..c271ec0 100644 --- a/macosx/tkMacOSXScale.c +++ b/macosx/tkMacOSXScale.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXScale.c,v 1.2 2002/08/31 06:12:30 das Exp $ + * RCS: @(#) $Id: tkMacOSXScale.c,v 1.3 2004/02/16 00:19:42 wolfsuit Exp $ */ #include "tkScale.h" @@ -152,7 +152,7 @@ TkpDisplayScale(clientData) SInt16 maxValue; SInt16 procID; SInt32 controlReference; - Boolean initiallyVisible=true; + Boolean initiallyVisible = true; fprintf(stderr,"TkpDisplayScale\n"); scalePtr->flags &= ~REDRAW_PENDING; @@ -206,8 +206,8 @@ TkpDisplayScale(clientData) * Set up port for drawing Macintosh control. */ macDraw = (MacDrawable *) Tk_WindowId(tkwin); - destPort=TkMacOSXGetDrawablePort(Tk_WindowId(tkwin)); - windowRef=GetWindowFromPort(destPort); + destPort = TkMacOSXGetDrawablePort(Tk_WindowId(tkwin)); + windowRef = GetWindowFromPort(destPort); GetGWorld(&saveWorld, &saveDevice); SetGWorld(destPort, NULL); TkMacOSXSetUpClippingRgn(Tk_WindowId(tkwin)); @@ -217,16 +217,16 @@ TkpDisplayScale(clientData) */ if (macScalePtr->scaleHandle == NULL) { fprintf(stderr,"Initialising scale\n"); - r.left=macDraw->xOff; - r.top=macDraw->yOff; - r.right=macDraw->xOff+Tk_Width(tkwin) - scalePtr->inset; - r.bottom=macDraw->yOff+Tk_Height(tkwin) - scalePtr->inset; - - initialValue=scalePtr->value; - minValue=scalePtr->toValue; - maxValue=scalePtr->fromValue; - procID=kControlSliderProc; - controlReference=(SInt32) macScalePtr; + r.left = macDraw->xOff; + r.top = macDraw->yOff; + r.right = macDraw->xOff+Tk_Width(tkwin) - scalePtr->inset; + r.bottom = macDraw->yOff+Tk_Height(tkwin) - scalePtr->inset; + + initialValue = scalePtr->value; + minValue = scalePtr->toValue; + maxValue = scalePtr->fromValue; + procID = kControlSliderProc; + controlReference = (SInt32) macScalePtr; macScalePtr->scaleHandle = NewControl(windowRef, &r, "\p", initiallyVisible, initialValue,minValue,maxValue, procID, controlReference); @@ -234,7 +234,7 @@ TkpDisplayScale(clientData) /* * If we are foremost than make us active. */ - if (windowRef==FrontWindow()) { + if (windowRef == FrontWindow()) { macScalePtr->flags |= ACTIVE; } } diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c index 76822e9..89c18d9 100644 --- a/macosx/tkMacOSXScrlbr.c +++ b/macosx/tkMacOSXScrlbr.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.8 2003/11/19 04:00:06 wolfsuit Exp $ + * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.9 2004/02/16 00:19:42 wolfsuit Exp $ */ #include "tkScrollbar.h" @@ -637,7 +637,7 @@ ThumbActionProc() NULL, &trackingResult); - if ((err==noErr) + if ((err == noErr) && ((trackingResult == kMouseTrackingMouseDragged) || (trackingResult == kMouseTrackingMouseMoved))) { /* @@ -681,7 +681,7 @@ ThumbActionProc() Tcl_GlobalEval(interp, cmdString.string); Tcl_Release((ClientData) interp); } - } while ((err==noErr) && trackingResult!=kMouseTrackingMouseReleased ); + } while ((err == noErr) && trackingResult != kMouseTrackingMouseReleased); Tcl_DStringFree(&cmdString); return; diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c index 064d470..43bb5a8 100644 --- a/macosx/tkMacOSXSubwindows.c +++ b/macosx/tkMacOSXSubwindows.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.3 2004/01/13 02:06:01 davygrvy Exp $ + * RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.4 2004/02/16 00:19:42 wolfsuit Exp $ */ #include "tkInt.h" @@ -898,8 +898,8 @@ TkMacOSXInvalidateWindow( WindowRef windowRef; CGrafPtr grafPtr; - grafPtr=TkMacOSXGetDrawablePort((Drawable)macWin); - windowRef=GetWindowFromPort(grafPtr); + grafPtr = TkMacOSXGetDrawablePort((Drawable)macWin); + windowRef = GetWindowFromPort(grafPtr); if (flag == TK_WINDOW_ONLY) { InvalWindowRgn(windowRef,macWin->clipRgn); diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index af3619b..f718d08 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -235,7 +235,7 @@ GenerateUpdateEvent(Window window) GetRegionBounds(visRgn,&bounds); bounds.right -= bounds.left; bounds.bottom -= bounds.top; - bounds.left= + bounds.left = 0; bounds.top=0; RectRgn(visRgn, &bounds); GenerateUpdates(visRgn, winPtr); diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index 0402e6a..61ddb1d 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXWm.c,v 1.10 2004/02/14 01:26:49 wolfsuit Exp $ + * RCS: @(#) $Id: tkMacOSXWm.c,v 1.11 2004/02/16 00:19:42 wolfsuit Exp $ */ #include @@ -5029,7 +5029,7 @@ TkMacOSXUnregisterMacWindow( if (!windowHashInit) { Tcl_Panic("TkMacOSXUnregisterMacWindow: unmapping before inited"); } - entryPtr=Tcl_FindHashEntry(&windowTable,(char *) macWinPtr); + entryPtr = Tcl_FindHashEntry(&windowTable,(char *) macWinPtr); if (!entryPtr) { fprintf(stderr,"Unregister:failed to find window %08x\n", (int) macWinPtr ); @@ -5253,15 +5253,15 @@ TkMacOSXWindowOffset( if (!strucRgn) { if(!(strucRgn = NewRgn())) { - err=MemError(); + err = MemError(); } } if (!contRgn) { if(!(contRgn = NewRgn())) { - err=MemError(); + err = MemError(); } } - if (err==noErr) { + if (err == noErr) { GetWindowRegion(wRef, kWindowStructureRgn, strucRgn); GetWindowRegion(wRef, kWindowContentRgn, contRgn); GetRegionBounds(strucRgn,&strucRect); -- cgit v0.12