summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordas <das>2004-11-11 01:26:40 (GMT)
committerdas <das>2004-11-11 01:26:40 (GMT)
commitce94eed8e3c51494a411e1389946fabf9923ff43 (patch)
treef24f480319309f3272f2b41ab1563f81c89ae1fc /generic
parentf4d485d83668861b7724e5349c8b5c3d4f70e28c (diff)
downloadtk-ce94eed8e3c51494a411e1389946fabf9923ff43.zip
tk-ce94eed8e3c51494a411e1389946fabf9923ff43.tar.gz
tk-ce94eed8e3c51494a411e1389946fabf9923ff43.tar.bz2
* generic/tkMain.c:
* macosx/tkMacOSXAppInit.c (removed): * macosx/Wish.pbproj/project.pbxproj: * macosx/tkMacOSXInit.c: * macosx/tkMacOSXInt.h: changes to make TkAqua dynamically loadable, enabling [package require Tk] from tclsh. Startup code from tkMacOSXAppInit.c moved into tkMacOSXInit.c, added code that notifies the window server that an unbundled executable is a full GUI application after loading Tk. [Patch 1035348] * doc/wm.n: documented [wm attributes] on Mac OS X. [Bug 606665] * macosx/tkMacOSXWm.c: implemented TIP 222 [wm attributes -alpha] on Mac OS X. [Patch 892194] WmIconbitmapCmd: adopted FSRef changes from [wm atttrs -titlepath]. * macosx/tkMacOSXButton.c: * macosx/tkMacOSXMenus.c: * macosx/tkMacOSXRegion.c: * macosx/tkMacOSXSubwindows.c: synced spacing/formatting with HEAD. * macosx/tkMacOSXMouseEvent.c: endianness fixes. * macosx/Wish.pbproj/project.pbxproj: corrected path to html help inside framework. * macosx/Makefile: prevent parallel make from building several targets at the same time. Ensure that xcodebuild will use Wish.pbproj project even if a .xcode project is also present.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkMain.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c
index d3e3a13..25f0d9d 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMain.c,v 1.15 2002/12/13 16:54:35 dgp Exp $
+ * RCS: @(#) $Id: tkMain.c,v 1.15.2.1 2004/11/11 01:26:42 das Exp $
*/
#include <ctype.h>
@@ -31,6 +31,9 @@
#ifdef __WIN32__
#include "tkWinInt.h"
#endif
+#ifdef MAC_OSX_TK
+#include "tkMacOSXInt.h"
+#endif
typedef struct ThreadSpecificData {
@@ -128,6 +131,12 @@ Tk_MainEx(argc, argv, appInitProc, interp)
#if (defined(__WIN32__) || defined(MAC_TCL))
Tk_InitConsoleChannels(interp);
#endif
+
+#ifdef MAC_OSX_TK
+ if (TclGetStartupScriptFileName() == NULL) {
+ TkMacOSXDefaultStartupScript();
+ }
+#endif
#ifdef TCL_MEM_DEBUG
Tcl_InitMemory(interp);