From 92c26aee05e92937090c66189ac215a1210f4e37 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Thu, 8 Dec 2005 07:50:09 +0000
Subject:         * 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].

---
 ChangeLog               | 9 ++++++++-
 macosx/tkMacOSXDraw.c   | 3 +--
 macosx/tkMacOSXFont.c   | 4 +---
 macosx/tkMacOSXInit.c   | 4 ++--
 macosx/tkMacOSXNotify.c | 9 +++++----
 macosx/tkMacOSXScrlbr.c | 4 ++--
 6 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3234b5e..4b14572 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 2005-12-08  Daniel Steffen  <das@users.sourceforge.net>
 
-        * macosx/tkMacOSXInt.h: sync comments with core-8-4-branch.
+        * 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: sync comments with core-8-4-branch.
 
 2005-12-07  Jeff Hobbs  <jeffh@ActiveState.com>
 
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index af3941c..77b71ab 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.7 2005/11/27 02:36:15 das Exp $
+ * RCS: @(#) $Id: tkMacOSXDraw.c,v 1.8 2005/12/08 07:50:13 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 550afa4..2059662 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.10 2005/11/27 02:36:15 das Exp $
+ * RCS: @(#) $Id: tkMacOSXFont.c,v 1.11 2005/12/08 07:50:14 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 3cb3019..00f02ea 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.16 2005/11/27 02:36:15 das Exp $
+ * RCS: @(#) $Id: tkMacOSXInit.c,v 1.17 2005/12/08 07:50:14 das Exp $
  */
 
 #include "tkInt.h"
 #include "tkMacOSXInt.h"
-#include "tclInt.h"
+#include "tclInt.h" /* for Tcl_GetStartupScript() & Tcl_SetStartupScript() */
 #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 845787a..10bcdcd 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.14 2005/11/27 02:36:15 das Exp $
+ * RCS: @(#) $Id: tkMacOSXNotify.c,v 1.15 2005/12/08 07:50:14 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 9179b3c..bd6dceb 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.16 2005/11/27 02:36:15 das Exp $
+ * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.17 2005/12/08 07:50:14 das Exp $
  */
 
 #include "tkScrollbar.h"
 #include "tkMacOSXInt.h"
-#include "tclInt.h"
+#include "tclInt.h" /* for TclServiceIdle() */
 
 #include <Carbon/Carbon.h>
 
-- 
cgit v0.12