diff options
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/Wish.pbproj/project.pbxproj | 39 | ||||
| -rw-r--r-- | macosx/Wish.xcode/project.pbxproj | 32 | ||||
| -rw-r--r-- | macosx/tkMacOSXXStubs.c | 4 |
3 files changed, 28 insertions, 47 deletions
diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj index 6f960ea..fb758e1 100644 --- a/macosx/Wish.pbproj/project.pbxproj +++ b/macosx/Wish.pbproj/project.pbxproj @@ -114,12 +114,6 @@ refType = 0; sourceTree = "<absolute>"; }; - 95911CC8081532D8006F6BCB = { - fileRef = 95911CC7081532D8006F6BCB; - isa = PBXBuildFile; - settings = { - }; - }; 95911CC9081532D8006F6BCB = { fileRef = 95911CC7081532D8006F6BCB; isa = PBXBuildFile; @@ -144,18 +138,6 @@ refType = 0; sourceTree = "<absolute>"; }; - F50D96130196176E01DC9062 = { - fileRef = F50D96120196176E01DC9062; - isa = PBXBuildFile; - settings = { - }; - }; - F50D96140196176E01DC9062 = { - fileRef = F50D96120196176E01DC9062; - isa = PBXBuildFile; - settings = { - }; - }; F51D903F018149BD01DC9062 = { buildActionMask = 2147483647; dstPath = "Versions/$(FRAMEWORK_VERSION)/Headers/X11"; @@ -2196,7 +2178,6 @@ Initial MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Cop buildActionMask = 2147483647; files = ( F537567E016C3ADB01DC9062, - F50D96130196176E01DC9062, 95911CC9081532D8006F6BCB, ); isa = PBXFrameworksBuildPhase; @@ -3106,10 +3087,10 @@ Initial MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Cop }; F537567C016C3ADB01DC9062 = { children = ( - 95911CC7081532D8006F6BCB, - F50D96120196176E01DC9062, F5875C7B016FEF1D01DC9062, + F50D96120196176E01DC9062, F537567D016C3ADB01DC9062, + 95911CC7081532D8006F6BCB, ); isa = PBXGroup; name = "External Frameworks"; @@ -3455,11 +3436,9 @@ Initial MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Cop buildActionMask = 2147483647; files = ( F53756A8016C4DD401DC9062, - F5875C7D016FEF1D01DC9062, F53756A7016C4DD401DC9062, - F50D96140196176E01DC9062, F5877FB9031F9F49016F146B, - 95911CC8081532D8006F6BCB, + F979766E08499884007D2C84, ); isa = PBXFrameworksBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -3628,12 +3607,6 @@ Initial MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Cop refType = 3; sourceTree = BUILT_PRODUCTS_DIR; }; - F5875C7D016FEF1D01DC9062 = { - fileRef = F5875C7B016FEF1D01DC9062; - isa = PBXBuildFile; - settings = { - }; - }; F5877FB7031F97ED016F146B = { buildActionMask = 8; files = ( @@ -4331,6 +4304,12 @@ Initial MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Cop refType = 2; sourceTree = SOURCE_ROOT; }; + F979766E08499884007D2C84 = { + fileRef = F5875C7B016FEF1D01DC9062; + isa = PBXBuildFile; + settings = { + }; + }; F9A61D2F04C2C861006F5A0B = { buildActionMask = 8; files = ( diff --git a/macosx/Wish.xcode/project.pbxproj b/macosx/Wish.xcode/project.pbxproj index d98c650..fae189b 100644 --- a/macosx/Wish.xcode/project.pbxproj +++ b/macosx/Wish.xcode/project.pbxproj @@ -1718,9 +1718,10 @@ }; F537567C016C3ADB01DC9062 = { children = ( - F50D96120196176E01DC9062, F5875C7B016FEF1D01DC9062, + F50D96120196176E01DC9062, F537567D016C3ADB01DC9062, + F979735F08499838007D2C84, ); isa = PBXGroup; name = "External Frameworks"; @@ -2374,7 +2375,6 @@ F95787E70745BB260058B6A3, F95787E80745BB260058B6A3, F957893F0745BB270058B6A3, - F95787EA0745BB260058B6A3, F957893E0745BB270058B6A3, ); isa = PBXFrameworksBuildPhase; @@ -2392,12 +2392,6 @@ settings = { }; }; - F95787EA0745BB260058B6A3 = { - fileRef = F50D96120196176E01DC9062; - isa = PBXBuildFile; - settings = { - }; - }; F95787EC0745BB260058B6A3 = { buildActionMask = 2147483647; files = ( @@ -3705,7 +3699,7 @@ buildActionMask = 2147483647; files = ( F95788F80745BB270058B6A3, - F95788F90745BB270058B6A3, + F979736008499838007D2C84, ); isa = PBXFrameworksBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -3716,12 +3710,6 @@ settings = { }; }; - F95788F90745BB270058B6A3 = { - fileRef = F50D96120196176E01DC9062; - isa = PBXBuildFile; - settings = { - }; - }; F95788FA0745BB270058B6A3 = { buildActionMask = 2147483647; files = ( @@ -4255,6 +4243,20 @@ settings = { }; }; + F979735F08499838007D2C84 = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = IOKit.framework; + path = /System/Library/Frameworks/IOKit.framework; + refType = 0; + sourceTree = "<absolute>"; + }; + F979736008499838007D2C84 = { + fileRef = F979735F08499838007D2C84; + isa = PBXBuildFile; + settings = { + }; + }; F9E036AE0748877B00D55D4F = { buildSettings = { GCC_ENABLE_FIX_AND_CONTINUE = YES; diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c index d79cf12..d75c52f 100644 --- a/macosx/tkMacOSXXStubs.c +++ b/macosx/tkMacOSXXStubs.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: tkMacOSXXStubs.c,v 1.10 2005/05/27 23:14:29 dkf Exp $ + * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.11 2005/05/29 06:47:05 das Exp $ */ #include "tkInt.h" @@ -1060,5 +1060,5 @@ Tk_GetUserInactiveTime(Display *dpy) void Tk_ResetUserInactiveTime(Display *dpy) { - UpdateSystemActivity(0); + UpdateSystemActivity(OverallAct); } |