From e49fac5b1a1937d9253af474812ecaec6771fe39 Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 7 Sep 2007 01:25:33 +0000 Subject: merge updates from HEAD --- ChangeLog | 12 +++++++++++ generic/tk3d.c | 3 ++- generic/tkArgv.c | 3 +-- generic/tkAtom.c | 3 +-- generic/tkBind.c | 3 +-- generic/tkBitmap.c | 3 +-- generic/tkButton.c | 3 ++- generic/tkCanvArc.c | 3 +-- generic/tkCanvBmap.c | 3 +-- generic/tkCanvImg.c | 3 +-- generic/tkCanvLine.c | 3 +-- generic/tkCanvPoly.c | 3 +-- generic/tkCanvPs.c | 3 +-- generic/tkCanvText.c | 3 +-- generic/tkCanvUtil.c | 3 +-- generic/tkCanvWind.c | 3 +-- generic/tkCanvas.c | 3 +-- generic/tkClipboard.c | 3 +-- generic/tkCmds.c | 3 +-- generic/tkColor.c | 3 ++- generic/tkConfig.c | 4 +--- generic/tkCursor.c | 3 +-- generic/tkError.c | 3 +-- generic/tkFocus.c | 3 +-- generic/tkFont.c | 3 +-- generic/tkFrame.c | 3 +-- generic/tkGC.c | 3 +-- generic/tkGeometry.c | 3 +-- generic/tkGet.c | 3 +-- generic/tkGrab.c | 3 +-- generic/tkImage.c | 3 +-- generic/tkImgBmap.c | 3 +-- generic/tkImgGIF.c | 3 +-- generic/tkImgPPM.c | 3 +-- generic/tkImgPhoto.c | 3 +-- generic/tkImgUtil.c | 3 +-- generic/tkInitScript.h | 54 ------------------------------------------------- generic/tkListbox.c | 3 +-- generic/tkMacWinMenu.c | 3 ++- generic/tkMain.c | 6 ++---- generic/tkMenu.c | 4 ++-- generic/tkMenuDraw.c | 3 ++- generic/tkMenubutton.c | 4 ++-- generic/tkMessage.c | 3 +-- generic/tkOldConfig.c | 3 +-- generic/tkOption.c | 3 +-- generic/tkPack.c | 3 +-- generic/tkPanedWindow.c | 3 +-- generic/tkPlace.c | 3 +-- generic/tkRectOval.c | 4 +--- generic/tkScale.c | 3 +-- generic/tkScrollbar.c | 4 ++-- generic/tkSquare.c | 4 +--- generic/tkStubInit.c | 8 +++----- generic/tkStubLib.c | 11 +++++----- generic/tkTest.c | 3 +-- generic/tkText.c | 3 +-- generic/tkTextBTree.c | 3 +-- generic/tkTextDisp.c | 3 +-- generic/tkTextImage.c | 5 ++--- generic/tkTextIndex.c | 3 +-- generic/tkTextMark.c | 3 +-- generic/tkTextTag.c | 3 +-- generic/tkTextWind.c | 5 ++--- generic/tkTrig.c | 3 +-- generic/tkUndo.c | 3 ++- generic/tkUtil.c | 3 +-- generic/tkVisual.c | 3 +-- generic/tkWindow.c | 25 +++++++++++++++++++++-- macosx/tkMacOSXInit.c | 10 ++------- unix/Makefile.in | 6 +++--- unix/tkUnix.c | 4 ++-- unix/tkUnix3d.c | 5 +++-- unix/tkUnixButton.c | 3 ++- unix/tkUnixColor.c | 5 +++-- unix/tkUnixConfig.c | 3 +-- unix/tkUnixCursor.c | 3 +-- unix/tkUnixDialog.c | 4 +--- unix/tkUnixDraw.c | 3 +-- unix/tkUnixEmbed.c | 3 +-- unix/tkUnixEvent.c | 3 +-- unix/tkUnixFocus.c | 4 +--- unix/tkUnixInit.c | 12 ++--------- unix/tkUnixMenu.c | 4 +--- unix/tkUnixMenubu.c | 3 ++- unix/tkUnixScale.c | 4 ++-- unix/tkUnixScrlbr.c | 3 ++- unix/tkUnixSend.c | 4 +--- unix/tkUnixWm.c | 4 +--- unix/tkUnixXId.c | 3 +-- win/tkWinConfig.c | 4 +--- win/tkWinInit.c | 10 ++------- win/tkWinSend.c | 3 ++- win/tkWinSendCom.c | 3 ++- win/ttkWinMonitor.c | 4 +--- win/ttkWinTheme.c | 3 +-- win/winMain.c | 5 ++--- 97 files changed, 165 insertions(+), 275 deletions(-) delete mode 100644 generic/tkInitScript.h diff --git a/ChangeLog b/ChangeLog index 8ddd144..7401ccf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-09-06 Don Porter + + * generic/tkWindow.c (Initialize): Moved common Tk initialization + * generic/tkInitScript.h (removed): script out of tkInitScript.h + * macosx/tkMacOSXInit.c: and multiple TkpInit() routines and + * unix/Makefile.in: into the common Initialize() routine in + * unix/tkUnixInit.c: generic code. Also removed constraint on + * win/tkWinInit.c: ability to define a custom [tkInit] before + calling Tk_Init(). Until now the custom [tkInit] had to be a proc. + Now it can be any command. Removal of tkInitScript.h also fixes + [Bug 1656283]. + 2007-09-06 Daniel Steffen * macosx/Wish.xcode/project.pbxproj: discontinue unmaintained support diff --git a/generic/tk3d.c b/generic/tk3d.c index 77c118e..65692ab 100644 --- a/generic/tk3d.c +++ b/generic/tk3d.c @@ -10,9 +10,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tk3d.c,v 1.17 2007/01/03 04:10:48 nijtmans Exp $ + * RCS: @(#) $Id: tk3d.c,v 1.17.2.1 2007/09/07 01:25:33 dgp Exp $ */ +#include "tkInt.h" #include "tk3d.h" /* diff --git a/generic/tkArgv.c b/generic/tkArgv.c index 69def03..6e3f41c 100644 --- a/generic/tkArgv.c +++ b/generic/tkArgv.c @@ -10,11 +10,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkArgv.c,v 1.5.2.1 2007/06/25 19:12:12 dgp Exp $ + * RCS: @(#) $Id: tkArgv.c,v 1.5.2.2 2007/09/07 01:25:33 dgp Exp $ */ #include "tkPort.h" -#include "tk.h" /* * Default table of argument descriptors. These are normally available in diff --git a/generic/tkAtom.c b/generic/tkAtom.c index 7e370d7..d3465ad 100644 --- a/generic/tkAtom.c +++ b/generic/tkAtom.c @@ -12,10 +12,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkAtom.c,v 1.5 2005/11/17 10:57:35 dkf Exp $ + * RCS: @(#) $Id: tkAtom.c,v 1.5.2.1 2007/09/07 01:25:33 dgp Exp $ */ -#include "tkPort.h" #include "tkInt.h" /* diff --git a/generic/tkBind.c b/generic/tkBind.c index 4f37426..05853ea 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -11,10 +11,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkBind.c,v 1.42 2007/01/18 23:56:43 nijtmans Exp $ + * RCS: @(#) $Id: tkBind.c,v 1.42.2.1 2007/09/07 01:25:33 dgp Exp $ */ -#include "tkPort.h" #include "tkInt.h" #ifdef __WIN32__ diff --git a/generic/tkBitmap.c b/generic/tkBitmap.c index c609dd9..f045efa 100644 --- a/generic/tkBitmap.c +++ b/generic/tkBitmap.c @@ -11,10 +11,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkBitmap.c,v 1.16.2.1 2007/06/25 19:12:12 dgp Exp $ + * RCS: @(#) $Id: tkBitmap.c,v 1.16.2.2 2007/09/07 01:25:33 dgp Exp $ */ -#include "tkPort.h" #include "tkInt.h" /* diff --git a/generic/tkButton.c b/generic/tkButton.c index 8794b47..511f5a7 100644 --- a/generic/tkButton.c +++ b/generic/tkButton.c @@ -11,9 +11,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkButton.c,v 1.26 2007/01/05 00:00:50 nijtmans Exp $ + * RCS: @(#) $Id: tkButton.c,v 1.26.2.1 2007/09/07 01:25:33 dgp Exp $ */ +#include "tkInt.h" #include "tkButton.h" #include "default.h" diff --git a/generic/tkCanvArc.c b/generic/tkCanvArc.c index 200f737..cf856d8 100644 --- a/generic/tkCanvArc.c +++ b/generic/tkCanvArc.c @@ -9,11 +9,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvArc.c,v 1.14 2005/11/04 23:41:56 dkf Exp $ + * RCS: @(#) $Id: tkCanvArc.c,v 1.14.2.1 2007/09/07 01:25:34 dgp Exp $ */ #include -#include "tkPort.h" #include "tkInt.h" #include "tkCanvas.h" diff --git a/generic/tkCanvBmap.c b/generic/tkCanvBmap.c index ad0b9cd..d6b8f85 100644 --- a/generic/tkCanvBmap.c +++ b/generic/tkCanvBmap.c @@ -9,12 +9,11 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvBmap.c,v 1.12 2005/11/04 15:23:05 dkf Exp $ + * RCS: @(#) $Id: tkCanvBmap.c,v 1.12.2.1 2007/09/07 01:25:34 dgp Exp $ */ #include #include "tkInt.h" -#include "tkPort.h" #include "tkCanvas.h" /* diff --git a/generic/tkCanvImg.c b/generic/tkCanvImg.c index d4c4486..4431586 100644 --- a/generic/tkCanvImg.c +++ b/generic/tkCanvImg.c @@ -9,12 +9,11 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvImg.c,v 1.9 2005/11/04 15:23:05 dkf Exp $ + * RCS: @(#) $Id: tkCanvImg.c,v 1.9.2.1 2007/09/07 01:25:34 dgp Exp $ */ #include #include "tkInt.h" -#include "tkPort.h" #include "tkCanvas.h" /* diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c index f76f817..1d15236 100644 --- a/generic/tkCanvLine.c +++ b/generic/tkCanvLine.c @@ -10,12 +10,11 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvLine.c,v 1.20 2007/02/12 21:34:39 dkf Exp $ + * RCS: @(#) $Id: tkCanvLine.c,v 1.20.2.1 2007/09/07 01:25:34 dgp Exp $ */ #include #include "tkInt.h" -#include "tkPort.h" #include "tkCanvas.h" /* diff --git a/generic/tkCanvPoly.c b/generic/tkCanvPoly.c index 7338d6d..a78a610 100644 --- a/generic/tkCanvPoly.c +++ b/generic/tkCanvPoly.c @@ -10,12 +10,11 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvPoly.c,v 1.16 2006/10/16 15:35:28 das Exp $ + * RCS: @(#) $Id: tkCanvPoly.c,v 1.16.2.1 2007/09/07 01:25:34 dgp Exp $ */ #include #include "tkInt.h" -#include "tkPort.h" #include "tkCanvas.h" /* diff --git a/generic/tkCanvPs.c b/generic/tkCanvPs.c index a650d46..23428ea 100644 --- a/generic/tkCanvPs.c +++ b/generic/tkCanvPs.c @@ -11,12 +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: tkCanvPs.c,v 1.17 2007/05/03 15:21:32 dkf Exp $ + * RCS: @(#) $Id: tkCanvPs.c,v 1.17.2.1 2007/09/07 01:25:34 dgp Exp $ */ #include "tkInt.h" #include "tkCanvas.h" -#include "tkPort.h" /* * See tkCanvas.h for key data structures used to implement canvases. diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c index b6f8878..bc0c3ed 100644 --- a/generic/tkCanvText.c +++ b/generic/tkCanvText.c @@ -9,13 +9,12 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvText.c,v 1.24 2007/04/23 21:15:17 das Exp $ + * RCS: @(#) $Id: tkCanvText.c,v 1.24.2.1 2007/09/07 01:25:34 dgp Exp $ */ #include #include "tkInt.h" #include "tkCanvas.h" -#include "tkPort.h" #include "default.h" /* diff --git a/generic/tkCanvUtil.c b/generic/tkCanvUtil.c index 0815df5..b62a0af 100644 --- a/generic/tkCanvUtil.c +++ b/generic/tkCanvUtil.c @@ -9,12 +9,11 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvUtil.c,v 1.15 2007/01/19 00:36:45 das Exp $ + * RCS: @(#) $Id: tkCanvUtil.c,v 1.15.2.1 2007/09/07 01:25:34 dgp Exp $ */ #include "tkInt.h" #include "tkCanvas.h" -#include "tkPort.h" #include /* diff --git a/generic/tkCanvWind.c b/generic/tkCanvWind.c index 27cf963..8579699 100644 --- a/generic/tkCanvWind.c +++ b/generic/tkCanvWind.c @@ -9,12 +9,11 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvWind.c,v 1.14 2007/01/05 00:00:51 nijtmans Exp $ + * RCS: @(#) $Id: tkCanvWind.c,v 1.14.2.1 2007/09/07 01:25:34 dgp Exp $ */ #include #include "tkInt.h" -#include "tkPort.h" #include "tkCanvas.h" /* diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c index 3a60a2b..36556e2 100644 --- a/generic/tkCanvas.c +++ b/generic/tkCanvas.c @@ -12,14 +12,13 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvas.c,v 1.43 2007/04/23 21:15:18 das Exp $ + * RCS: @(#) $Id: tkCanvas.c,v 1.43.2.1 2007/09/07 01:25:34 dgp Exp $ */ /* #define USE_OLD_TAG_SEARCH 1 */ #include "default.h" #include "tkInt.h" -#include "tkPort.h" #include "tkCanvas.h" #ifdef TK_NO_DOUBLE_BUFFERING #ifdef MAC_OSX_TK diff --git a/generic/tkClipboard.c b/generic/tkClipboard.c index bf4876d..faebe9f 100644 --- a/generic/tkClipboard.c +++ b/generic/tkClipboard.c @@ -11,11 +11,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkClipboard.c,v 1.15 2005/11/17 16:21:55 dkf Exp $ + * RCS: @(#) $Id: tkClipboard.c,v 1.15.2.1 2007/09/07 01:25:34 dgp Exp $ */ #include "tkInt.h" -#include "tkPort.h" #include "tkSelect.h" /* diff --git a/generic/tkCmds.c b/generic/tkCmds.c index 04d1dc9..0e9ebee 100644 --- a/generic/tkCmds.c +++ b/generic/tkCmds.c @@ -11,10 +11,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCmds.c,v 1.39 2007/01/18 23:56:43 nijtmans Exp $ + * RCS: @(#) $Id: tkCmds.c,v 1.39.2.1 2007/09/07 01:25:34 dgp Exp $ */ -#include "tkPort.h" #include "tkInt.h" #if defined(WIN32) diff --git a/generic/tkColor.c b/generic/tkColor.c index 7619b99..fbf7e77 100644 --- a/generic/tkColor.c +++ b/generic/tkColor.c @@ -11,9 +11,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkColor.c,v 1.14 2007/02/12 21:45:41 dkf Exp $ + * RCS: @(#) $Id: tkColor.c,v 1.14.2.1 2007/09/07 01:25:34 dgp Exp $ */ +#include "tkInt.h" #include "tkColor.h" /* diff --git a/generic/tkConfig.c b/generic/tkConfig.c index 614d244..e805741 100644 --- a/generic/tkConfig.c +++ b/generic/tkConfig.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkConfig.c,v 1.24 2007/05/03 21:53:13 dkf Exp $ + * RCS: @(#) $Id: tkConfig.c,v 1.24.2.1 2007/09/07 01:25:34 dgp Exp $ */ /* @@ -25,9 +25,7 @@ #define __NO_OLD_CONFIG #endif -#include "tk.h" #include "tkInt.h" -#include "tkPort.h" #include "tkFont.h" /* diff --git a/generic/tkCursor.c b/generic/tkCursor.c index bf3ab05..ef553b4 100644 --- a/generic/tkCursor.c +++ b/generic/tkCursor.c @@ -11,10 +11,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCursor.c,v 1.15 2007/01/03 04:10:54 nijtmans Exp $ + * RCS: @(#) $Id: tkCursor.c,v 1.15.2.1 2007/09/07 01:25:34 dgp Exp $ */ -#include "tkPort.h" #include "tkInt.h" /* diff --git a/generic/tkError.c b/generic/tkError.c index fe84fe3..fa7831c 100644 --- a/generic/tkError.c +++ b/generic/tkError.c @@ -12,10 +12,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkError.c,v 1.4 2005/11/15 15:18:21 dkf Exp $ + * RCS: @(#) $Id: tkError.c,v 1.4.2.1 2007/09/07 01:25:34 dgp Exp $ */ -#include "tkPort.h" #include "tkInt.h" /* diff --git a/generic/tkFocus.c b/generic/tkFocus.c index 5e667db..5aedfe5 100644 --- a/generic/tkFocus.c +++ b/generic/tkFocus.c @@ -9,11 +9,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkFocus.c,v 1.13 2005/11/16 09:28:21 dkf Exp $ + * RCS: @(#) $Id: tkFocus.c,v 1.13.2.1 2007/09/07 01:25:34 dgp Exp $ */ #include "tkInt.h" -#include "tkPort.h" /* * For each top-level window that has ever received the focus, there is a diff --git a/generic/tkFont.c b/generic/tkFont.c index 9867b86..6aeb9eb 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -10,10 +10,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkFont.c,v 1.35.2.2 2007/06/25 19:12:13 dgp Exp $ + * RCS: @(#) $Id: tkFont.c,v 1.35.2.3 2007/09/07 01:25:34 dgp Exp $ */ -#include "tkPort.h" #include "tkInt.h" #include "tkFont.h" diff --git a/generic/tkFrame.c b/generic/tkFrame.c index 4af642d..3dcb1e5 100644 --- a/generic/tkFrame.c +++ b/generic/tkFrame.c @@ -11,11 +11,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkFrame.c,v 1.28 2007/04/23 21:15:18 das Exp $ + * RCS: @(#) $Id: tkFrame.c,v 1.28.2.1 2007/09/07 01:25:34 dgp Exp $ */ #include "default.h" -#include "tkPort.h" #include "tkInt.h" /* diff --git a/generic/tkGC.c b/generic/tkGC.c index d0c8091..516b247 100644 --- a/generic/tkGC.c +++ b/generic/tkGC.c @@ -10,10 +10,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkGC.c,v 1.7 2005/11/17 10:57:35 dkf Exp $ + * RCS: @(#) $Id: tkGC.c,v 1.7.2.1 2007/09/07 01:25:34 dgp Exp $ */ -#include "tkPort.h" #include "tkInt.h" /* diff --git a/generic/tkGeometry.c b/generic/tkGeometry.c index f7e42c3..b49561f 100644 --- a/generic/tkGeometry.c +++ b/generic/tkGeometry.c @@ -10,10 +10,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkGeometry.c,v 1.10 2007/02/12 21:57:44 dkf Exp $ + * RCS: @(#) $Id: tkGeometry.c,v 1.10.2.1 2007/09/07 01:25:34 dgp Exp $ */ -#include "tkPort.h" #include "tkInt.h" /* diff --git a/generic/tkGet.c b/generic/tkGet.c index b58ae03..b887990 100644 --- a/generic/tkGet.c +++ b/generic/tkGet.c @@ -12,11 +12,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkGet.c,v 1.11 2005/11/07 15:58:21 dkf Exp $ + * RCS: @(#) $Id: tkGet.c,v 1.11.2.1 2007/09/07 01:25:34 dgp Exp $ */ #include "tkInt.h" -#include "tkPort.h" /* * One of these structures is created per thread to store thread-specific diff --git a/generic/tkGrab.c b/generic/tkGrab.c index b9b1d3d..7997647 100644 --- a/generic/tkGrab.c +++ b/generic/tkGrab.c @@ -9,10 +9,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkGrab.c,v 1.11 2005/11/14 22:44:11 dkf Exp $ + * RCS: @(#) $Id: tkGrab.c,v 1.11.2.1 2007/09/07 01:25:34 dgp Exp $ */ -#include "tkPort.h" #include "tkInt.h" #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) diff --git a/generic/tkImage.c b/generic/tkImage.c index bb78315..7a2f52f 100644 --- a/generic/tkImage.c +++ b/generic/tkImage.c @@ -10,11 +10,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkImage.c,v 1.32 2007/05/14 20:58:27 dgp Exp $ + * RCS: @(#) $Id: tkImage.c,v 1.32.2.1 2007/09/07 01:25:34 dgp Exp $ */ #include "tkInt.h" -#include "tkPort.h" /* * Each call to Tk_GetImage returns a pointer to one of the following diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c index 7bae9fe..b1fe8be 100644 --- a/generic/tkImgBmap.c +++ b/generic/tkImgBmap.c @@ -10,11 +10,10 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkImgBmap.c,v 1.20 2006/10/19 00:48:25 patthoyts Exp $ + * RCS: @(#) $Id: tkImgBmap.c,v 1.20.2.1 2007/09/07 01:25:35 dgp Exp $ */ #include "tkInt.h" -#include "tkPort.h" /* * The following data structure represents the master for a bitmap diff --git a/generic/tkImgGIF.c b/generic/tkImgGIF.c index c2bc318..865cb1f 100644 --- a/generic/tkImgGIF.c +++ b/generic/tkImgGIF.c @@ -32,7 +32,7 @@ * This file also contains code from miGIF. See lower down in file for the * applicable copyright notice for that portion. * - * RCS: @(#) $Id: tkImgGIF.c,v 1.35 2007/01/12 09:08:36 dkf Exp $ + * RCS: @(#) $Id: tkImgGIF.c,v 1.35.2.1 2007/09/07 01:25:35 dgp Exp $ */ /* @@ -62,7 +62,6 @@ typedef struct mFile { } MFile; #include "tkInt.h" -#include "tkPort.h" /* * Non-ASCII encoding support: diff --git a/generic/tkImgPPM.c b/generic/tkImgPPM.c index c40c40c..bfd3288 100644 --- a/generic/tkImgPPM.c +++ b/generic/tkImgPPM.c @@ -13,11 +13,10 @@ * Department of Computer Science, * Australian National University. * - * RCS: @(#) $Id: tkImgPPM.c,v 1.16.2.1 2007/06/25 19:12:13 dgp Exp $ + * RCS: @(#) $Id: tkImgPPM.c,v 1.16.2.2 2007/09/07 01:25:35 dgp Exp $ */ #include "tkInt.h" -#include "tkPort.h" /* * The maximum amount of memory to allocate for data read from the file. If we diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index 944a9de..fbc3a7a 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -17,11 +17,10 @@ * Department of Computer Science, * Australian National University. * - * RCS: @(#) $Id: tkImgPhoto.c,v 1.69.2.1 2007/06/25 19:12:13 dgp Exp $ + * RCS: @(#) $Id: tkImgPhoto.c,v 1.69.2.2 2007/09/07 01:25:35 dgp Exp $ */ #include "tkInt.h" -#include "tkPort.h" #include #ifdef __WIN32__ diff --git a/generic/tkImgUtil.c b/generic/tkImgUtil.c index 3c1accf..0354f28 100644 --- a/generic/tkImgUtil.c +++ b/generic/tkImgUtil.c @@ -8,11 +8,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkImgUtil.c,v 1.5 2007/01/11 15:35:39 dkf Exp $ + * RCS: @(#) $Id: tkImgUtil.c,v 1.5.2.1 2007/09/07 01:25:35 dgp Exp $ */ #include "tkInt.h" -#include "tkPort.h" #include "xbytes.h" diff --git a/generic/tkInitScript.h b/generic/tkInitScript.h deleted file mode 100644 index ee86e1b..0000000 --- a/generic/tkInitScript.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * tkInitScript.h -- - * - * This file contains Unix & Windows common init script - * - * Copyright (c) 1997 Sun Microsystems, Inc. - * - * See the file "license.terms" for information on usage and redistribution of - * this file, and for a DISCLAIMER OF ALL WARRANTIES. - * - * RCS: @(#) $Id: tkInitScript.h,v 1.10 2005/11/15 15:18:21 dkf Exp $ - */ - -/* - * In order to find tk.tcl during initialization, the following script is - * invoked by Tk_Init(). It looks in several different directories: - * - * $tk_library - can specify a primary location, if set no - * other locations will be checked - * - * $env(TK_LIBRARY) - highest priority so user can always override - * the search path unless the application has - * specified an exact directory above - * - * $tcl_library/../tk$tk_version - * - look relative to init.tcl in an installed - * lib directory (e.g. /usr/local) - * - * /../lib/tk$tk_version - * - look for a lib/tk in a sibling of the - * bin directory (e.g. /usr/local) - * - * /../library - * - look in Tk build directory - * - * /../../tk$tk_patchLevel/library - * - look for Tk build directory relative to a - * parallel build directory - * - * The first directory on this path that contains a valid tk.tcl script will - * be set ast the value of tk_library. - * - * Note that this entire search mechanism can be bypassed by defining an - * alternate tkInit procedure before calling Tk_Init(). - */ - -static char initScript[] = "if {[info proc tkInit]==\"\"} {\n\ - proc tkInit {} {\n\ - global tk_library tk_version tk_patchLevel\n\ - rename tkInit {}\n\ - tcl_findLibrary tk $tk_version $tk_patchLevel tk.tcl TK_LIBRARY tk_library\n\ - }\n\ -}\n\ -tkInit"; diff --git a/generic/tkListbox.c b/generic/tkListbox.c index 87d82c1..c14f0da 100644 --- a/generic/tkListbox.c +++ b/generic/tkListbox.c @@ -11,10 +11,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkListbox.c,v 1.40 2007/04/23 21:15:18 das Exp $ + * RCS: @(#) $Id: tkListbox.c,v 1.40.2.1 2007/09/07 01:25:35 dgp Exp $ */ -#include "tkPort.h" #include "default.h" #include "tkInt.h" diff --git a/generic/tkMacWinMenu.c b/generic/tkMacWinMenu.c index fa8dff6..307235b 100644 --- a/generic/tkMacWinMenu.c +++ b/generic/tkMacWinMenu.c @@ -9,9 +9,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacWinMenu.c,v 1.4 2005/11/14 22:44:11 dkf Exp $ + * RCS: @(#) $Id: tkMacWinMenu.c,v 1.4.2.1 2007/09/07 01:25:35 dgp Exp $ */ +#include "tkInt.h" #include "tkMenu.h" typedef struct ThreadSpecificData { diff --git a/generic/tkMain.c b/generic/tkMain.c index bf478fc..4292249 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -13,15 +13,13 @@ * 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.23 2007/03/07 23:46:33 das Exp $ + * RCS: @(#) $Id: tkMain.c,v 1.23.2.1 2007/09/07 01:25:35 dgp Exp $ */ #include #include #include -#include -#include -#include +#include "tclInt.h" #include "tkInt.h" #ifdef NO_STDLIB_H # include "../compat/stdlib.h" diff --git a/generic/tkMenu.c b/generic/tkMenu.c index b603b43..b95f751 100644 --- a/generic/tkMenu.c +++ b/generic/tkMenu.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMenu.c,v 1.38.2.1 2007/06/25 19:12:13 dgp Exp $ + * RCS: @(#) $Id: tkMenu.c,v 1.38.2.2 2007/09/07 01:25:35 dgp Exp $ */ /* @@ -74,7 +74,7 @@ #define __NO_OLD_CONFIG #endif -#include "tkPort.h" +#include "tkInt.h" #include "tkMenu.h" #define MENU_HASH_KEY "tkMenus" diff --git a/generic/tkMenuDraw.c b/generic/tkMenuDraw.c index e64cce7..d4eb286 100644 --- a/generic/tkMenuDraw.c +++ b/generic/tkMenuDraw.c @@ -9,9 +9,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMenuDraw.c,v 1.8 2005/11/15 15:18:21 dkf Exp $ + * RCS: @(#) $Id: tkMenuDraw.c,v 1.8.2.1 2007/09/07 01:25:35 dgp Exp $ */ +#include "tkInt.h" #include "tkMenu.h" /* diff --git a/generic/tkMenubutton.c b/generic/tkMenubutton.c index d71dcfa..a2db54c 100644 --- a/generic/tkMenubutton.c +++ b/generic/tkMenubutton.c @@ -10,11 +10,11 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMenubutton.c,v 1.15.2.1 2007/06/25 19:12:13 dgp Exp $ + * RCS: @(#) $Id: tkMenubutton.c,v 1.15.2.2 2007/09/07 01:25:35 dgp Exp $ */ +#include "tkInt.h" #include "tkMenubutton.h" -#include "tkPort.h" #include "default.h" /* diff --git a/generic/tkMessage.c b/generic/tkMessage.c index 6392d76..c383919 100644 --- a/generic/tkMessage.c +++ b/generic/tkMessage.c @@ -12,10 +12,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMessage.c,v 1.17 2007/01/03 05:06:26 nijtmans Exp $ + * RCS: @(#) $Id: tkMessage.c,v 1.17.2.1 2007/09/07 01:25:36 dgp Exp $ */ -#include "tkPort.h" #include "default.h" #include "tkInt.h" diff --git a/generic/tkOldConfig.c b/generic/tkOldConfig.c index 944c4ef..3d50a13 100644 --- a/generic/tkOldConfig.c +++ b/generic/tkOldConfig.c @@ -11,11 +11,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkOldConfig.c,v 1.21 2007/02/13 00:30:19 dkf Exp $ + * RCS: @(#) $Id: tkOldConfig.c,v 1.21.2.1 2007/09/07 01:25:36 dgp Exp $ */ #include "tkPort.h" -#include "tk.h" /* * Values for "flags" field of Tk_ConfigSpec structures. Be sure to coordinate diff --git a/generic/tkOption.c b/generic/tkOption.c index c8c1414..f482272 100644 --- a/generic/tkOption.c +++ b/generic/tkOption.c @@ -11,10 +11,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkOption.c,v 1.20.2.1 2007/06/25 19:12:13 dgp Exp $ + * RCS: @(#) $Id: tkOption.c,v 1.20.2.2 2007/09/07 01:25:36 dgp Exp $ */ -#include "tkPort.h" #include "tkInt.h" /* diff --git a/generic/tkPack.c b/generic/tkPack.c index 67074f7..b95626e 100644 --- a/generic/tkPack.c +++ b/generic/tkPack.c @@ -10,10 +10,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPack.c,v 1.25 2007/01/05 00:00:51 nijtmans Exp $ + * RCS: @(#) $Id: tkPack.c,v 1.25.2.1 2007/09/07 01:25:36 dgp Exp $ */ -#include "tkPort.h" #include "tkInt.h" typedef enum {TOP, BOTTOM, LEFT, RIGHT} Side; diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c index c5379df..b69a8cb 100644 --- a/generic/tkPanedWindow.c +++ b/generic/tkPanedWindow.c @@ -12,10 +12,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPanedWindow.c,v 1.28 2007/04/23 21:15:18 das Exp $ + * RCS: @(#) $Id: tkPanedWindow.c,v 1.28.2.1 2007/09/07 01:25:36 dgp Exp $ */ -#include "tkPort.h" #include "default.h" #include "tkInt.h" diff --git a/generic/tkPlace.c b/generic/tkPlace.c index e23cf68..ce334bc 100644 --- a/generic/tkPlace.c +++ b/generic/tkPlace.c @@ -10,10 +10,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPlace.c,v 1.20.2.1 2007/06/25 19:12:13 dgp Exp $ + * RCS: @(#) $Id: tkPlace.c,v 1.20.2.2 2007/09/07 01:25:36 dgp Exp $ */ -#include "tkPort.h" #include "tkInt.h" /* diff --git a/generic/tkRectOval.c b/generic/tkRectOval.c index b0fb6be..05eb2ab 100644 --- a/generic/tkRectOval.c +++ b/generic/tkRectOval.c @@ -9,13 +9,11 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkRectOval.c,v 1.15 2006/10/16 15:35:28 das Exp $ + * RCS: @(#) $Id: tkRectOval.c,v 1.15.2.1 2007/09/07 01:25:36 dgp Exp $ */ #include -#include "tk.h" #include "tkInt.h" -#include "tkPort.h" #include "tkCanvas.h" /* diff --git a/generic/tkScale.c b/generic/tkScale.c index 36ca7e5..904e12b 100644 --- a/generic/tkScale.c +++ b/generic/tkScale.c @@ -16,10 +16,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkScale.c,v 1.24.2.1 2007/06/25 19:12:13 dgp Exp $ + * RCS: @(#) $Id: tkScale.c,v 1.24.2.2 2007/09/07 01:25:36 dgp Exp $ */ -#include "tkPort.h" #include "default.h" #include "tkInt.h" #include "tkScale.h" diff --git a/generic/tkScrollbar.c b/generic/tkScrollbar.c index c73aca7..790eb5c 100644 --- a/generic/tkScrollbar.c +++ b/generic/tkScrollbar.c @@ -11,10 +11,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkScrollbar.c,v 1.8 2005/11/17 10:57:35 dkf Exp $ + * RCS: @(#) $Id: tkScrollbar.c,v 1.8.2.1 2007/09/07 01:25:36 dgp Exp $ */ -#include "tkPort.h" +#include "tkInt.h" #include "tkScrollbar.h" #include "default.h" diff --git a/generic/tkSquare.c b/generic/tkSquare.c index d0b8836..577b813 100644 --- a/generic/tkSquare.c +++ b/generic/tkSquare.c @@ -12,12 +12,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkSquare.c,v 1.7 2007/01/03 05:06:26 nijtmans Exp $ + * RCS: @(#) $Id: tkSquare.c,v 1.7.2.1 2007/09/07 01:25:36 dgp Exp $ */ -#include "tkPort.h" #define __NO_OLD_CONFIG -#include "tk.h" #include "tkInt.h" /* diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 9a9674e..ba00d6c 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -8,15 +8,15 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkStubInit.c,v 1.57 2007/05/14 20:58:27 dgp Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.57.2.1 2007/09/07 01:25:36 dgp Exp $ */ #include "tkInt.h" -#include "tkPort.h" #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* UNIX */ #define UNIX_TK +#include "tkUnixInt.h" #endif #ifdef __WIN32__ @@ -28,10 +28,8 @@ #include "tkMacOSXInt.h" #endif -#include "tkDecls.h" +/* TODO: These ought to come in some other way */ #include "tkPlatDecls.h" -#include "tkIntDecls.h" -#include "tkIntPlatDecls.h" #include "tkIntXlibDecls.h" /* diff --git a/generic/tkStubLib.c b/generic/tkStubLib.c index 43721d8..74cab2f 100644 --- a/generic/tkStubLib.c +++ b/generic/tkStubLib.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: tkStubLib.c,v 1.14 2007/05/16 18:35:20 jenglish Exp $ + * RCS: @(#) $Id: tkStubLib.c,v 1.14.2.1 2007/09/07 01:25:36 dgp Exp $ */ /* @@ -30,7 +30,6 @@ #endif #undef USE_TK_STUB_PROCS -#include "tkPort.h" #include "tkInt.h" #ifdef __WIN32__ @@ -41,10 +40,12 @@ #include "tkMacOSXInt.h" #endif -#include "tkDecls.h" -#include "tkIntDecls.h" +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) +#include "tkUnixInt.h" +#endif + +/* TODO: These ought to come in some other way */ #include "tkPlatDecls.h" -#include "tkIntPlatDecls.h" #include "tkIntXlibDecls.h" TkStubs *tkStubsPtr; diff --git a/generic/tkTest.c b/generic/tkTest.c index b867202..06d2b30 100644 --- a/generic/tkTest.c +++ b/generic/tkTest.c @@ -13,11 +13,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkTest.c,v 1.32.2.1 2007/09/06 18:23:54 dgp Exp $ + * RCS: @(#) $Id: tkTest.c,v 1.32.2.2 2007/09/07 01:25:36 dgp Exp $ */ #include "tkInt.h" -#include "tkPort.h" #include "tkText.h" #ifdef __WIN32__ diff --git a/generic/tkText.c b/generic/tkText.c index 7054262..5ab82f2 100644 --- a/generic/tkText.c +++ b/generic/tkText.c @@ -13,11 +13,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkText.c,v 1.75 2007/04/23 21:15:18 das Exp $ + * RCS: @(#) $Id: tkText.c,v 1.75.2.1 2007/09/07 01:25:36 dgp Exp $ */ #include "default.h" -#include "tkPort.h" #include "tkInt.h" #include "tkUndo.h" diff --git a/generic/tkTextBTree.c b/generic/tkTextBTree.c index 912dc90..31756e2 100644 --- a/generic/tkTextBTree.c +++ b/generic/tkTextBTree.c @@ -11,11 +11,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkTextBTree.c,v 1.25 2007/02/23 13:37:49 das Exp $ + * RCS: @(#) $Id: tkTextBTree.c,v 1.25.2.1 2007/09/07 01:25:36 dgp Exp $ */ #include "tkInt.h" -#include "tkPort.h" #include "tkText.h" /* diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index 315c190..c935010 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -12,10 +12,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkTextDisp.c,v 1.63.2.1 2007/06/01 04:01:32 dgp Exp $ + * RCS: @(#) $Id: tkTextDisp.c,v 1.63.2.2 2007/09/07 01:25:36 dgp Exp $ */ -#include "tkPort.h" #include "tkInt.h" #include "tkText.h" diff --git a/generic/tkTextImage.c b/generic/tkTextImage.c index d290250..09be68c 100644 --- a/generic/tkTextImage.c +++ b/generic/tkTextImage.c @@ -9,12 +9,11 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkTextImage.c,v 1.19 2007/01/18 23:20:37 nijtmans Exp $ + * RCS: @(#) $Id: tkTextImage.c,v 1.19.2.1 2007/09/07 01:25:36 dgp Exp $ */ -#include "tk.h" -#include "tkText.h" #include "tkPort.h" +#include "tkText.h" /* * Macro that determines the size of an embedded image segment: diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c index 511806b..25198a5 100644 --- a/generic/tkTextIndex.c +++ b/generic/tkTextIndex.c @@ -10,11 +10,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkTextIndex.c,v 1.25 2007/02/22 13:56:33 dkf Exp $ + * RCS: @(#) $Id: tkTextIndex.c,v 1.25.2.1 2007/09/07 01:25:36 dgp Exp $ */ #include "default.h" -#include "tkPort.h" #include "tkInt.h" #include "tkText.h" diff --git a/generic/tkTextMark.c b/generic/tkTextMark.c index d1b5b87..0884757 100644 --- a/generic/tkTextMark.c +++ b/generic/tkTextMark.c @@ -10,12 +10,11 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkTextMark.c,v 1.18 2007/02/22 13:56:33 dkf Exp $ + * RCS: @(#) $Id: tkTextMark.c,v 1.18.2.1 2007/09/07 01:25:36 dgp Exp $ */ #include "tkInt.h" #include "tkText.h" -#include "tkPort.h" /* * Macro that determines the size of a mark segment: diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c index c3552c8..918b7cf 100644 --- a/generic/tkTextTag.c +++ b/generic/tkTextTag.c @@ -11,11 +11,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkTextTag.c,v 1.25 2007/02/22 13:56:33 dkf Exp $ + * RCS: @(#) $Id: tkTextTag.c,v 1.25.2.1 2007/09/07 01:25:36 dgp Exp $ */ #include "default.h" -#include "tkPort.h" #include "tkInt.h" #include "tkText.h" diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c index 62d8b72..0b15a03 100644 --- a/generic/tkTextWind.c +++ b/generic/tkTextWind.c @@ -11,12 +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: tkTextWind.c,v 1.21 2007/02/22 13:56:33 dkf Exp $ + * RCS: @(#) $Id: tkTextWind.c,v 1.21.2.1 2007/09/07 01:25:36 dgp Exp $ */ -#include "tk.h" -#include "tkText.h" #include "tkPort.h" +#include "tkText.h" /* * The following structure is the official type record for the embedded window diff --git a/generic/tkTrig.c b/generic/tkTrig.c index e4f20a0..3138361 100644 --- a/generic/tkTrig.c +++ b/generic/tkTrig.c @@ -11,12 +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: tkTrig.c,v 1.7 2005/11/17 16:21:56 dkf Exp $ + * RCS: @(#) $Id: tkTrig.c,v 1.7.2.1 2007/09/07 01:25:36 dgp Exp $ */ #include #include "tkInt.h" -#include "tkPort.h" #include "tkCanvas.h" #undef MIN diff --git a/generic/tkUndo.c b/generic/tkUndo.c index a540260..fd56a24 100644 --- a/generic/tkUndo.c +++ b/generic/tkUndo.c @@ -9,9 +9,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUndo.c,v 1.11 2007/02/13 00:02:23 dkf Exp $ + * RCS: @(#) $Id: tkUndo.c,v 1.11.2.1 2007/09/07 01:25:36 dgp Exp $ */ +#include "tkInt.h" #include "tkUndo.h" static int EvaluateActionList(Tcl_Interp *interp, diff --git a/generic/tkUtil.c b/generic/tkUtil.c index 05a76d2..f98716d 100644 --- a/generic/tkUtil.c +++ b/generic/tkUtil.c @@ -10,11 +10,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUtil.c,v 1.17 2007/02/25 04:30:30 pspjuth Exp $ + * RCS: @(#) $Id: tkUtil.c,v 1.17.2.1 2007/09/07 01:25:36 dgp Exp $ */ #include "tkInt.h" -#include "tkPort.h" /* * The structure below defines the implementation of the "statekey" Tcl diff --git a/generic/tkVisual.c b/generic/tkVisual.c index b8cd42f..ddbe53a 100644 --- a/generic/tkVisual.c +++ b/generic/tkVisual.c @@ -11,11 +11,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkVisual.c,v 1.7 2005/11/15 15:18:22 dkf Exp $ + * RCS: @(#) $Id: tkVisual.c,v 1.7.2.1 2007/09/07 01:25:36 dgp Exp $ */ #include "tkInt.h" -#include "tkPort.h" /* * The table below maps from symbolic names for visual classes to the diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 4a821e0..0362386 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -11,10 +11,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWindow.c,v 1.80 2007/02/13 00:16:39 dkf Exp $ + * RCS: @(#) $Id: tkWindow.c,v 1.80.2.1 2007/09/07 01:25:36 dgp Exp $ */ -#include "tkPort.h" #include "tkInt.h" #if !( defined(__WIN32__) || defined(MAC_OSX_TK)) @@ -3233,6 +3232,28 @@ Initialize( } code = TkpInit(interp); if (code == TCL_OK) { + + /* + * In order to find tk.tcl during initialization, we evaluate the + * following script. It calls on the Tcl command [tcl_findLibrary] + * to perform the search. See the docs for that command for details + * on where it looks. + * + * Note that this entire search mechanism can be bypassed by defining + * an alternate [tkInit] command before calling Tk_Init(). + */ + + code = Tcl_Eval(interp, +"if {[namespace which -command tkInit] eq \"\"} {\n\ + proc tkInit {} {\n\ + global tk_library tk_version tk_patchLevel\n\ + rename tkInit {}\n\ + tcl_findLibrary tk $tk_version $tk_patchLevel tk.tcl TK_LIBRARY tk_library\n\ + }\n\ +}\n\ +tkInit"); + } + if (code == TCL_OK) { /* * Create exit handlers to delete all windows when the application or * thread exits. The handler need to be invoked before other platform diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index e6052fe..ed06f25 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -11,7 +11,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.28.2.3 2007/07/01 17:31:33 dgp Exp $ + * RCS: @(#) $Id: tkMacOSXInit.c,v 1.28.2.4 2007/09/07 01:25:37 dgp Exp $ */ #include "tkMacOSXPrivate.h" @@ -24,12 +24,6 @@ #include /* - * The Init script (common to Windows and Unix platforms) is - * defined in tkInitScript.h - */ -#include "tkInitScript.h" - -/* * Define the following to 0 to not attempt to use an undocumented SPI * to notify the window server that an unbundled executable is a full * GUI application after loading Tk. @@ -387,7 +381,7 @@ TkpInit( TCL_GLOBAL_ONLY|TCL_LIST_ELEMENT|TCL_APPEND_VALUE); } - return Tcl_EvalEx(interp, initScript, -1, TCL_EVAL_GLOBAL); + return TCL_OK; } /* diff --git a/unix/Makefile.in b/unix/Makefile.in index 1ee8628..b2adb7c 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.128.2.7 2007/09/06 18:23:55 dgp Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.128.2.8 2007/09/07 01:25:37 dgp Exp $ # Current Tk version; used in various names. @@ -1167,7 +1167,7 @@ tkUnixFont.o: $(UNIX_DIR)/tkUnixFont.c tkUnixRFont.o: $(UNIX_DIR)/tkUnixRFont.c $(CC) -c $(CC_SWITCHES) $(XFT_CFLAGS) $(UNIX_DIR)/tkUnixRFont.c -tkUnixInit.o: $(UNIX_DIR)/tkUnixInit.c $(GENERIC_DIR)/tkInitScript.h tkConfig.sh +tkUnixInit.o: $(UNIX_DIR)/tkUnixInit.c tkConfig.sh $(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \ $(UNIX_DIR)/tkUnixInit.c @@ -1243,7 +1243,7 @@ tkMacOSXFont.o: $(MAC_OSX_DIR)/tkMacOSXFont.c tkMacOSXHLEvents.o: $(MAC_OSX_DIR)/tkMacOSXHLEvents.c $(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXHLEvents.c -tkMacOSXInit.o: $(MAC_OSX_DIR)/tkMacOSXInit.c $(GENERIC_DIR)/tkInitScript.h tkConfig.sh +tkMacOSXInit.o: $(MAC_OSX_DIR)/tkMacOSXInit.c tkConfig.sh $(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \ $(MAC_OSX_DIR)/tkMacOSXInit.c diff --git a/unix/tkUnix.c b/unix/tkUnix.c index 993bc9d..f189657 100644 --- a/unix/tkUnix.c +++ b/unix/tkUnix.c @@ -10,10 +10,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnix.c,v 1.13 2006/07/20 06:25:20 das Exp $ + * RCS: @(#) $Id: tkUnix.c,v 1.13.2.1 2007/09/07 01:25:37 dgp Exp $ */ -#include +#include "tkInt.h" #ifdef HAVE_XSS #include #endif diff --git a/unix/tkUnix3d.c b/unix/tkUnix3d.c index 63e6161..223fc02 100644 --- a/unix/tkUnix3d.c +++ b/unix/tkUnix3d.c @@ -9,10 +9,11 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnix3d.c,v 1.10 2005/11/13 21:00:17 dkf Exp $ + * RCS: @(#) $Id: tkUnix3d.c,v 1.10.2.1 2007/09/07 01:25:37 dgp Exp $ */ -#include +#include "tkInt.h" +#include "tk3d.h" #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) #include "tkUnixInt.h" diff --git a/unix/tkUnixButton.c b/unix/tkUnixButton.c index 9a0ff1c..7fee40b 100644 --- a/unix/tkUnixButton.c +++ b/unix/tkUnixButton.c @@ -8,9 +8,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixButton.c,v 1.23 2007/02/27 14:52:56 dkf Exp $ + * RCS: @(#) $Id: tkUnixButton.c,v 1.23.2.1 2007/09/07 01:25:37 dgp Exp $ */ +#include "tkInt.h" #include "tkButton.h" #include "tk3d.h" diff --git a/unix/tkUnixColor.c b/unix/tkUnixColor.c index e32233b..629d1dc 100644 --- a/unix/tkUnixColor.c +++ b/unix/tkUnixColor.c @@ -9,10 +9,11 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixColor.c,v 1.4 2005/10/21 01:51:44 dkf Exp $ + * RCS: @(#) $Id: tkUnixColor.c,v 1.4.2.1 2007/09/07 01:25:38 dgp Exp $ */ -#include +#include "tkInt.h" +#include "tkColor.h" /* * If a colormap fills up, attempts to allocate new colors from that colormap diff --git a/unix/tkUnixConfig.c b/unix/tkUnixConfig.c index b063fb3..9676385 100644 --- a/unix/tkUnixConfig.c +++ b/unix/tkUnixConfig.c @@ -9,10 +9,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixConfig.c,v 1.4 2005/11/13 21:00:17 dkf Exp $ + * RCS: @(#) $Id: tkUnixConfig.c,v 1.4.2.1 2007/09/07 01:25:38 dgp Exp $ */ -#include "tk.h" #include "tkInt.h" diff --git a/unix/tkUnixCursor.c b/unix/tkUnixCursor.c index 1430ad9..fa7f25c 100644 --- a/unix/tkUnixCursor.c +++ b/unix/tkUnixCursor.c @@ -8,10 +8,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixCursor.c,v 1.10 2006/12/19 08:53:38 dkf Exp $ + * RCS: @(#) $Id: tkUnixCursor.c,v 1.10.2.1 2007/09/07 01:25:38 dgp Exp $ */ -#include "tkPort.h" #include "tkInt.h" /* diff --git a/unix/tkUnixDialog.c b/unix/tkUnixDialog.c index e4a1d86..e67f51b 100644 --- a/unix/tkUnixDialog.c +++ b/unix/tkUnixDialog.c @@ -8,12 +8,10 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixDialog.c,v 1.4 2005/11/13 21:00:17 dkf Exp $ + * RCS: @(#) $Id: tkUnixDialog.c,v 1.4.2.1 2007/09/07 01:25:38 dgp Exp $ * */ -#include "tkPort.h" -#include "tkInt.h" #include "tkUnixInt.h" /* diff --git a/unix/tkUnixDraw.c b/unix/tkUnixDraw.c index 074bdad..01d4dd6 100644 --- a/unix/tkUnixDraw.c +++ b/unix/tkUnixDraw.c @@ -8,10 +8,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixDraw.c,v 1.9 2005/11/14 11:54:21 dkf Exp $ + * RCS: @(#) $Id: tkUnixDraw.c,v 1.9.2.1 2007/09/07 01:25:38 dgp Exp $ */ -#include "tkPort.h" #include "tkInt.h" #if !defined(__WIN32__) diff --git a/unix/tkUnixEmbed.c b/unix/tkUnixEmbed.c index c06cbdc..3134e2a 100644 --- a/unix/tkUnixEmbed.c +++ b/unix/tkUnixEmbed.c @@ -11,10 +11,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixEmbed.c,v 1.10 2006/05/29 22:21:40 hobbs Exp $ + * RCS: @(#) $Id: tkUnixEmbed.c,v 1.10.2.1 2007/09/07 01:25:39 dgp Exp $ */ -#include "tkInt.h" #include "tkUnixInt.h" /* diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c index dde8432..3b11cb4 100644 --- a/unix/tkUnixEvent.c +++ b/unix/tkUnixEvent.c @@ -9,10 +9,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixEvent.c,v 1.24 2007/05/03 22:16:00 dkf Exp $ + * RCS: @(#) $Id: tkUnixEvent.c,v 1.24.2.1 2007/09/07 01:25:39 dgp Exp $ */ -#include "tkInt.h" #include "tkUnixInt.h" #include diff --git a/unix/tkUnixFocus.c b/unix/tkUnixFocus.c index 479ef61..a8107eb 100644 --- a/unix/tkUnixFocus.c +++ b/unix/tkUnixFocus.c @@ -9,11 +9,9 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixFocus.c,v 1.5 2005/10/21 01:51:45 dkf Exp $ + * RCS: @(#) $Id: tkUnixFocus.c,v 1.5.2.1 2007/09/07 01:25:39 dgp Exp $ */ -#include "tkInt.h" -#include "tkPort.h" #include "tkUnixInt.h" diff --git a/unix/tkUnixInit.c b/unix/tkUnixInit.c index 4fbef46..1e2781d 100644 --- a/unix/tkUnixInit.c +++ b/unix/tkUnixInit.c @@ -8,19 +8,11 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixInit.c,v 1.7 2005/11/14 11:54:21 dkf Exp $ + * RCS: @(#) $Id: tkUnixInit.c,v 1.7.2.1 2007/09/07 01:25:39 dgp Exp $ */ -#include "tkInt.h" #include "tkUnixInt.h" -/* - * The Init script (common to Windows and Unix platforms) is defined in - * tkInitScript.h - */ - -#include "tkInitScript.h" - #ifdef HAVE_COREFOUNDATION static int GetLibraryPath(Tcl_Interp *interp); #else @@ -51,7 +43,7 @@ TkpInit( { TkCreateXEventSource(); GetLibraryPath(interp); - return Tcl_Eval(interp, initScript); + return TCL_OK; } /* diff --git a/unix/tkUnixMenu.c b/unix/tkUnixMenu.c index 445d22e..fb41d39 100644 --- a/unix/tkUnixMenu.c +++ b/unix/tkUnixMenu.c @@ -8,12 +8,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixMenu.c,v 1.16 2007/02/27 14:52:57 dkf Exp $ + * RCS: @(#) $Id: tkUnixMenu.c,v 1.16.2.1 2007/09/07 01:25:39 dgp Exp $ */ -#include "tkPort.h" #include "default.h" -#include "tkInt.h" #include "tkUnixInt.h" #include "tkMenu.h" diff --git a/unix/tkUnixMenubu.c b/unix/tkUnixMenubu.c index 201e974..05d36c2 100644 --- a/unix/tkUnixMenubu.c +++ b/unix/tkUnixMenubu.c @@ -9,9 +9,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixMenubu.c,v 1.9 2007/04/25 17:08:51 hobbs Exp $ + * RCS: @(#) $Id: tkUnixMenubu.c,v 1.9.2.1 2007/09/07 01:25:40 dgp Exp $ */ +#include "tkInt.h" #include "tkMenubutton.h" /* diff --git a/unix/tkUnixScale.c b/unix/tkUnixScale.c index f7970b5..3d242bb 100644 --- a/unix/tkUnixScale.c +++ b/unix/tkUnixScale.c @@ -9,11 +9,11 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixScale.c,v 1.11 2007/04/23 21:15:17 das Exp $ + * RCS: @(#) $Id: tkUnixScale.c,v 1.11.2.1 2007/09/07 01:25:40 dgp Exp $ */ -#include "tkScale.h" #include "tkInt.h" +#include "tkScale.h" /* * Forward declarations for functions defined later in this file: diff --git a/unix/tkUnixScrlbr.c b/unix/tkUnixScrlbr.c index 074fff3..be704e3 100644 --- a/unix/tkUnixScrlbr.c +++ b/unix/tkUnixScrlbr.c @@ -9,9 +9,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixScrlbr.c,v 1.4 2005/11/13 21:00:17 dkf Exp $ + * RCS: @(#) $Id: tkUnixScrlbr.c,v 1.4.2.1 2007/09/07 01:25:40 dgp Exp $ */ +#include "tkInt.h" #include "tkScrollbar.h" /* diff --git a/unix/tkUnixSend.c b/unix/tkUnixSend.c index 7f038b7..2aa2624 100644 --- a/unix/tkUnixSend.c +++ b/unix/tkUnixSend.c @@ -11,11 +11,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixSend.c,v 1.18 2007/05/03 22:16:00 dkf Exp $ + * RCS: @(#) $Id: tkUnixSend.c,v 1.18.2.1 2007/09/07 01:25:40 dgp Exp $ */ -#include "tkPort.h" -#include "tkInt.h" #include "tkUnixInt.h" /* diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c index f97f0ae..171dc98 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.c @@ -12,11 +12,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixWm.c,v 1.55 2007/02/27 14:52:57 dkf Exp $ + * RCS: @(#) $Id: tkUnixWm.c,v 1.55.2.1 2007/09/07 01:25:40 dgp Exp $ */ -#include "tkPort.h" -#include "tkInt.h" #include "tkUnixInt.h" /* diff --git a/unix/tkUnixXId.c b/unix/tkUnixXId.c index 37a621f..db36e31 100644 --- a/unix/tkUnixXId.c +++ b/unix/tkUnixXId.c @@ -16,7 +16,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixXId.c,v 1.8 2005/10/21 01:51:45 dkf Exp $ + * RCS: @(#) $Id: tkUnixXId.c,v 1.8.2.1 2007/09/07 01:25:40 dgp Exp $ */ /* @@ -28,7 +28,6 @@ #define XLIB_ILLEGAL_ACCESS 1 #include "tkUnixInt.h" -#include "tkPort.h" /* * A structure of the following type is used to hold one or more available diff --git a/win/tkWinConfig.c b/win/tkWinConfig.c index 967ee86..2e95533 100644 --- a/win/tkWinConfig.c +++ b/win/tkWinConfig.c @@ -9,11 +9,9 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinConfig.c,v 1.4 2005/12/02 00:19:04 dkf Exp $ + * RCS: @(#) $Id: tkWinConfig.c,v 1.4.2.1 2007/09/07 01:25:40 dgp Exp $ */ -#include "tk.h" -#include "tkInt.h" #include "tkWinInt.h" diff --git a/win/tkWinInit.c b/win/tkWinInit.c index 71c98af..1b68091 100644 --- a/win/tkWinInit.c +++ b/win/tkWinInit.c @@ -9,17 +9,11 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinInit.c,v 1.12 2005/12/02 00:19:04 dkf Exp $ + * RCS: @(#) $Id: tkWinInit.c,v 1.12.2.1 2007/09/07 01:25:40 dgp Exp $ */ #include "tkWinInt.h" -/* - * The Init script (common to Windows and Unix platforms) is defined in - * tkInitScript.h - */ - -#include "tkInitScript.h" /* *---------------------------------------------------------------------- @@ -49,7 +43,7 @@ TkpInit( */ TkWinXInit(Tk_GetHINSTANCE()); - return Tcl_Eval(interp, initScript); + return TCL_OK; } /* diff --git a/win/tkWinSend.c b/win/tkWinSend.c index 3a064be..ee9838b 100644 --- a/win/tkWinSend.c +++ b/win/tkWinSend.c @@ -10,9 +10,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinSend.c,v 1.12 2007/01/11 15:35:41 dkf Exp $ + * RCS: @(#) $Id: tkWinSend.c,v 1.12.2.1 2007/09/07 01:25:40 dgp Exp $ */ +#include "tkInt.h" #include "tkWinSendCom.h" /* diff --git a/win/tkWinSendCom.c b/win/tkWinSendCom.c index 8b54d51..9f7018f 100644 --- a/win/tkWinSendCom.c +++ b/win/tkWinSendCom.c @@ -18,9 +18,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinSendCom.c,v 1.6 2005/12/02 13:42:29 dkf Exp $ + * RCS: @(#) $Id: tkWinSendCom.c,v 1.6.2.1 2007/09/07 01:25:41 dgp Exp $ */ +#include "tkInt.h" #include "tkWinSendCom.h" /* diff --git a/win/ttkWinMonitor.c b/win/ttkWinMonitor.c index b6c5a15..6b38068 100644 --- a/win/ttkWinMonitor.c +++ b/win/ttkWinMonitor.c @@ -1,4 +1,4 @@ -/* $Id: ttkWinMonitor.c,v 1.10 2007/04/17 14:32:28 dkf Exp $ +/* $Id: ttkWinMonitor.c,v 1.10.2.1 2007/09/07 01:25:41 dgp Exp $ */ #ifdef _MSC_VER @@ -6,8 +6,6 @@ #endif #include -#include -#include #include #include "ttk/ttkTheme.h" diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c index c0c04ff..c9daf2f 100644 --- a/win/ttkWinTheme.c +++ b/win/ttkWinTheme.c @@ -1,6 +1,6 @@ /* winTheme.c - Copyright (C) 2004 Pat Thoyts * - * $Id: ttkWinTheme.c,v 1.5 2007/04/17 14:32:28 dkf Exp $ + * $Id: ttkWinTheme.c,v 1.5.2.1 2007/09/07 01:25:41 dgp Exp $ */ #ifdef _MSC_VER @@ -9,7 +9,6 @@ #include -#include #include #ifndef DFCS_HOT /* Windows 98/Me, Windows 200/XP only */ diff --git a/win/winMain.c b/win/winMain.c index 5176a00..c859864 100644 --- a/win/winMain.c +++ b/win/winMain.c @@ -9,16 +9,15 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: winMain.c,v 1.23 2005/12/02 00:19:04 dkf Exp $ + * RCS: @(#) $Id: winMain.c,v 1.23.2.1 2007/09/07 01:25:41 dgp Exp $ */ -#include +#include "tkInt.h" #define WIN32_LEAN_AND_MEAN #include #undef WIN32_LEAN_AND_MEAN #include -#include "tkInt.h" /* * The following declarations refer to internal Tk routines. These interfaces -- cgit v0.12