summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--doc/Tk_Main.38
-rw-r--r--generic/tkMain.c3
-rw-r--r--macosx/tkMacOSXInit.c4
4 files changed, 17 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 418b439..a5216c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-15 Don Porter <dgp@users.sourceforge.net>
+
+ TIP #338 IMPLEMENTATION
+
+ * doc/Tk_Main.c: Removed the last two '#include "tclInt.h"'.
+ * generic/tkMain.c: Tk is now limited to Tcl's public interface.
+ * macosx/tkMacOSXInit.c:
+
2008-12-12 Pat Thoyts <patthoyts@users.sourceforge.net>
* library/demos/fontchoose.tcl: Simple fontchooser demo
diff --git a/doc/Tk_Main.3 b/doc/Tk_Main.3
index 31e3723..3c8da3f 100644
--- a/doc/Tk_Main.3
+++ b/doc/Tk_Main.3
@@ -5,7 +5,7 @@
'\" See the file "license.terms" for information on usage and redistribution
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
'\"
-'\" RCS: @(#) $Id: Tk_Main.3,v 1.7 2008/06/30 22:57:02 dkf Exp $
+'\" RCS: @(#) $Id: Tk_Main.3,v 1.8 2008/12/15 16:17:18 dgp Exp $
'\"
.so man.macros
.TH Tk_Main 3 4.0 Tk "Tk Library Procedures"
@@ -57,5 +57,11 @@ typedef int \fBTcl_AppInitProc\fR(
\fIAppInitProc\fR is almost always a pointer to \fBTcl_AppInit\fR;
for more details on this procedure, see the documentation
for \fBTcl_AppInit\fR.
+.PP
+\fBTk_Main\fR functions much the same as \fBTcl_Main\fR. In particular,
+\fBTk_Main\fR supports both an interactive mode and a startup script
+mode, with the file name and encoding of a startup script under the
+control of the \fBTcl_SetStartupScript\fR and \fBTcl_GetStartupScript\fR
+routines.
.SH KEYWORDS
application-specific initialization, command-line arguments, main program
diff --git a/generic/tkMain.c b/generic/tkMain.c
index b008f41..5dd5f40 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -13,13 +13,12 @@
* 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.31 2008/11/08 18:44:40 dkf Exp $
+ * RCS: @(#) $Id: tkMain.c,v 1.32 2008/12/15 16:17:18 dgp Exp $
*/
#include <ctype.h>
#include <stdio.h>
#include <string.h>
-#include "tclInt.h"
#include "tkInt.h"
#ifdef NO_STDLIB_H
# include "../compat/stdlib.h"
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 85fb35a..f1b41cb 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -11,13 +11,11 @@
* 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.37 2008/12/09 23:53:37 das Exp $
+ * RCS: @(#) $Id: tkMacOSXInit.c,v 1.38 2008/12/15 16:17:18 dgp Exp $
*/
#include "tkMacOSXPrivate.h"
-#include "tclInt.h" /* for Tcl_GetStartupScript() & Tcl_SetStartupScript() */
-
#include <sys/stat.h>
#include <sys/utsname.h>
#include <mach-o/dyld.h>