6 files changed, 17 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index d329597..7b400ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-12-08  Daniel Steffen  <das@users.sourceforge.net>
 
+        * macosx/tkMacOSXDraw.c:   remove inclusion of tclInt.h and use of tcl
+        * macosx/tkMacOSXFont.c:   internals wherever possible in tk/macosx, the
+        * macosx/tkMacOSXInit.c:   only remaining tcl internals in TkAqua are
+        * macosx/tkMacOSXNotify.c: TclServiceIdle() in tkMacOSXScrlbr.c and
+        * macosx/tkMacOSXScrlbr.c: Tcl_Get/SetStartupScript() in tkMacOSXInit.c
+	                           [Bug 1336531].
         * macosx/tkMacOSXInt.h:
         * macosx/tkMacOSXWindowEvent.c:
         * macosx/tkMacOSXXStubs.c: sync comments/whitespace with HEAD.
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index e24eb8b..5722057 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.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: tkMacOSXDraw.c,v 1.2.2.8 2005/11/27 02:36:46 das Exp $
+ * RCS: @(#) $Id: tkMacOSXDraw.c,v 1.2.2.9 2005/12/08 07:50:30 das Exp $
  */
 
-#include "tclInt.h"
 #include "tkInt.h"
 #include "X11/X.h"
 #include "X11/Xlib.h"
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index 953af3c..2a2466e 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.c
@@ -11,12 +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: tkMacOSXFont.c,v 1.3.2.5 2005/11/27 02:36:46 das Exp $
+ * RCS: @(#) $Id: tkMacOSXFont.c,v 1.3.2.6 2005/12/08 07:50:30 das Exp $
  */
 #include <Carbon/Carbon.h>
 
-#include "tclInt.h"
-
 #include "tkMacOSXInt.h"
 #include "tkFont.h"
 
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index f558b4a..a1ee640 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -10,12 +10,12 @@
  * 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.2.11 2005/11/27 02:36:46 das Exp $
+ * RCS: @(#) $Id: tkMacOSXInit.c,v 1.3.2.12 2005/12/08 07:50:30 das Exp $
  */
 
 #include "tkInt.h"
 #include "tkMacOSXInt.h"
-#include "tclInt.h"
+#include "tclInt.h" /* for TclGetStartupScript() & TclSetStartupScript() */
 #include <sys/stat.h>
 #include <mach-o/dyld.h>
 #include <mach-o/getsect.h>
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index a51d666..b6a711b 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.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: tkMacOSXNotify.c,v 1.5.2.7 2005/11/27 02:36:46 das Exp $
+ * RCS: @(#) $Id: tkMacOSXNotify.c,v 1.5.2.8 2005/12/08 07:50:30 das Exp $
  */
 
-#include "tclInt.h"
 #include "tkInt.h"
 #include "tkMacOSXEvent.h"
 #include <pthread.h>
@@ -54,7 +53,8 @@ static void CarbonEventsCheckProc(ClientData clientData, int flags);
 void
 Tk_MacOSXSetupTkNotifier()
 {
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
+    ThreadSpecificData *tsdPtr = Tcl_GetThreadData(&dataKey,
+	    sizeof(ThreadSpecificData));
     
     if (!tsdPtr->initialized) {
         /* HACK ALERT: There is a bug in Jaguar where when it goes to make
@@ -107,7 +107,8 @@ static void
 TkMacOSXNotifyExitHandler(clientData)
     ClientData clientData;	/* Not used. */
 {
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
+    ThreadSpecificData *tsdPtr = Tcl_GetThreadData(&dataKey,
+	    sizeof(ThreadSpecificData));
 
     Tcl_DeleteEventSource(CarbonEventsSetupProc, 
             CarbonEventsCheckProc, GetMainEventQueue());
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index 0dd42e0..0f91662 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -11,12 +11,12 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.5.2.6 2005/10/18 00:41:19 hobbs Exp $
+ * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.5.2.7 2005/12/08 07:50:30 das Exp $
  */
 
 #include "tkScrollbar.h"
 #include "tkMacOSXInt.h"
-#include "tclInt.h"
+#include "tclInt.h" /* for TclServiceIdle() */
 
 #include <Carbon/Carbon.h>