summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXNotify.c
diff options
context:
space:
mode:
authordas <das>2005-12-08 07:50:27 (GMT)
committerdas <das>2005-12-08 07:50:27 (GMT)
commitd2258e9d68e9e664d40be6081ae6f07212393749 (patch)
treee3401c5a3919f913ff976e04d8d93db7a52eebf3 /macosx/tkMacOSXNotify.c
parent7b8ab866347e0f1c861505307905f03a19153477 (diff)
downloadtk-d2258e9d68e9e664d40be6081ae6f07212393749.zip
tk-d2258e9d68e9e664d40be6081ae6f07212393749.tar.gz
tk-d2258e9d68e9e664d40be6081ae6f07212393749.tar.bz2
* 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].
Diffstat (limited to 'macosx/tkMacOSXNotify.c')
-rw-r--r--macosx/tkMacOSXNotify.c9
1 files changed, 5 insertions, 4 deletions
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());