summaryrefslogtreecommitdiffstats
path: root/macosx/Wish.pbproj
diff options
context:
space:
mode:
authordas <das>2003-05-13 02:42:57 (GMT)
committerdas <das>2003-05-13 02:42:57 (GMT)
commitda1bf4fb459b1e4f5e1be8a76e14029d4a9d331b (patch)
treededfb9313098f6f370b756eefb7f3817c98756c5 /macosx/Wish.pbproj
parent996aa5aa5d6fca18e46c0f25c7f25589a1d85003 (diff)
downloadtk-da1bf4fb459b1e4f5e1be8a76e14029d4a9d331b.zip
tk-da1bf4fb459b1e4f5e1be8a76e14029d4a9d331b.tar.gz
tk-da1bf4fb459b1e4f5e1be8a76e14029d4a9d331b.tar.bz2
backport of Mac OS X specific changes on trunk since 8.4.2:
* macosx/tkMacOSXClipboard.c (TkSelGetSelection): Convert '\r' to '\n' on the way into Tcl. (ingham) * macosx/tkMacOSXMenu.c (EventuallyInvokeMenu): New function, used to invoke menu commands at idle time. (TkMacOSXDispatchMenuEvent): Don't immediately dispatch menu commands, wait till the idle loop to do so. This is more like what is done on Windows, and avoids the crash from destroying a menu in it's command. (ingham) * macosx/tkMacOSXHLEvents.c (ReallyKillMe): Don't force the shell to exit. According to the OS X HI guidelines, it should be possible to cancel an attempt to quit, and if we force the kill, here, it would not be possible to implement this. (ingham) * macosx/tkMacOSXApplication.r (removed): * macosx/tkMacOSXLibrary.r (removed): * macosx/tkMacOSXResource.r (removed): * macosx/Wish.pbproj/project.pbxproj: * macosx/tkAboutDlg.r: updated copyrights, cleaned up about box, removed obsolete unused resource files. (steffen)
Diffstat (limited to 'macosx/Wish.pbproj')
-rw-r--r--macosx/Wish.pbproj/project.pbxproj31
1 files changed, 3 insertions, 28 deletions
diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj
index eaec7aa..e91ace9 100644
--- a/macosx/Wish.pbproj/project.pbxproj
+++ b/macosx/Wish.pbproj/project.pbxproj
@@ -328,11 +328,8 @@
children = (
F5375533016C376E01DC9062,
4C3B4CF6040B18B200C916F0,
- F5375534016C376E01DC9062,
F5375535016C376E01DC9062,
- F5375536016C376E01DC9062,
F5375538016C376E01DC9062,
- F5375539016C376E01DC9062,
F537553A016C376E01DC9062,
);
isa = PBXGroup;
@@ -345,36 +342,18 @@
path = tkAboutDlg.r;
refType = 4;
};
- F5375534016C376E01DC9062 = {
- fileEncoding = 5;
- isa = PBXFileReference;
- path = tkMacOSXApplication.r;
- refType = 4;
- };
F5375535016C376E01DC9062 = {
fileEncoding = 5;
isa = PBXFileReference;
path = tkMacOSXCursors.r;
refType = 4;
};
- F5375536016C376E01DC9062 = {
- fileEncoding = 5;
- isa = PBXFileReference;
- path = tkMacOSXLibrary.r;
- refType = 4;
- };
F5375538016C376E01DC9062 = {
fileEncoding = 5;
isa = PBXFileReference;
path = tkMacOSXMenu.r;
refType = 4;
};
- F5375539016C376E01DC9062 = {
- fileEncoding = 5;
- isa = PBXFileReference;
- path = tkMacOSXResource.r;
- refType = 4;
- };
F537553A016C376E01DC9062 = {
fileEncoding = 5;
isa = PBXFileReference;
@@ -1530,7 +1509,7 @@
);
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 8.4;
- DYLIB_CURRENT_VERSION = 8.4;
+ DYLIB_CURRENT_VERSION = "$(FRAMEWORK_VERSION)";
DYLIB_INSTALL_PATH = /Library/Frameworks;
FRAMEWORK_SEARCH_PATHS = "\"$(TCL_FRAMEWORK_DIR)\"";
FRAMEWORK_VERSION = 8.4;
@@ -1549,10 +1528,6 @@
SECTORDER_FLAGS = "";
TCLSH_DIR = "$(TCL_FRAMEWORK_DIR)";
TCL_FRAMEWORK_DIR = "$(SYMROOT)";
- TK_MAJOR_VERSION = 8;
- TK_MINOR_VERSION = 4;
- TK_PATCH_LEVEL = .1;
- TK_VERSION = 8.4;
USE_GCC3_PFE_SUPPORT = YES;
WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
WRAPPER_EXTENSION = framework;
@@ -1574,7 +1549,7 @@
<key>CFBundleExecutable</key>
<string>Tk</string>
<key>CFBundleGetInfoString</key>
- <string>Tk Library 8.4, Copyright © 2002 Tcl Core Team.
+ <string>Tk Library 8.4, Copyright © 2003 Tcl Core Team.
MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright © 2001-2002, Apple Computer, Inc.</string>
<key>CFBundleIconFile</key>
<string></string>
@@ -2953,7 +2928,7 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
<key>CFBundleExecutable</key>
<string>Wish Shell</string>
<key>CFBundleGetInfoString</key>
- <string>Wish Shell 8.4, Copyright © 2002 Tcl Core Team.
+ <string>Wish Shell 8.4, Copyright © 2003 Tcl Core Team.
MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright © 2001-2002, Apple Computer, Inc.</string>
<key>CFBundleIconFile</key>
<string>Wish.icns</string>