summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--macosx/tkMacOSXInit.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5214350..40575e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2003-05-13 Daniel Steffen <das@users.sourceforge.net>
+ * macosx/tkMacOSXInit.c (TkpInit): use new versioned bundle
+ resource API to get tk runtime library for TK_VERSION. [Bug 736774]
+
+2003-05-13 Daniel Steffen <das@users.sourceforge.net>
+
backport of Mac OS X specific changes on trunk since 8.4.2:
* macosx/tkMacOSXClipboard.c (TkSelGetSelection): Convert
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 2180769..c8c9ef3 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.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: tkMacOSXInit.c,v 1.3 2002/10/16 19:44:05 das Exp $
+ * RCS: @(#) $Id: tkMacOSXInit.c,v 1.3.2.1 2003/05/13 08:41:48 das Exp $
*/
#include "tkInt.h"
@@ -143,8 +143,8 @@ TkpInit(interp)
* FIXME: Should we come up with a more generic way of doing this?
*/
- result = Tcl_MacOSXOpenBundleResources(interp, "com.tcltk.tklibrary",
- 1, 1024, tkLibPath);
+ result = Tcl_MacOSXOpenVersionedBundleResources(interp,
+ "com.tcltk.tklibrary", TK_VERSION, 1, 1024, tkLibPath);
if (result != TCL_ERROR) {
Tcl_SetVar(interp, "tk_library", tkLibPath, TCL_GLOBAL_ONLY);