summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authordas <das>2005-05-24 02:32:15 (GMT)
committerdas <das>2005-05-24 02:32:15 (GMT)
commit343055908105d05cde7d76e4920a7c2bc913cd8e (patch)
treebe2a4452d69b3ccea3d4e43601ada02a893f5a7b /macosx
parentfd9c7b478a0e22830d8e3f08e985cfb64fe26797 (diff)
downloadtk-343055908105d05cde7d76e4920a7c2bc913cd8e.zip
tk-343055908105d05cde7d76e4920a7c2bc913cd8e.tar.gz
tk-343055908105d05cde7d76e4920a7c2bc913cd8e.tar.bz2
fix for non-framework TkAqua build
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXInit.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 14e9cbf..780bcc3 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.10 2005/05/23 20:24:59 das Exp $
+ * RCS: @(#) $Id: tkMacOSXInit.c,v 1.11 2005/05/24 02:32:15 das Exp $
*/
#include "tkInt.h"
@@ -160,8 +160,11 @@ TkpInit(interp)
* FIXME: Should we come up with a more generic way of doing this?
*/
+#ifdef TK_FRAMEWORK
if (Tcl_MacOSXOpenVersionedBundleResources(interp,
- "com.tcltk.tklibrary", TK_FRAMEWORK_VERSION, 1, PATH_MAX, tkLibPath) != TCL_OK) {
+ "com.tcltk.tklibrary", TK_FRAMEWORK_VERSION, 1, PATH_MAX, tkLibPath) != TCL_OK)
+#endif
+ {
/* Tk.framework not found, check if resource file is open */
Handle rsrc = Get1NamedResource('CURS', "\phand");
if (rsrc) {