summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mac/tkMac.h3
-rw-r--r--mac/tkMacAppInit.c3
-rw-r--r--mac/tkMacBitmap.c6
-rw-r--r--mac/tkMacButton.c4
-rw-r--r--mac/tkMacClipboard.c12
5 files changed, 13 insertions, 15 deletions
diff --git a/mac/tkMac.h b/mac/tkMac.h
index 214822a..e23e424 100644
--- a/mac/tkMac.h
+++ b/mac/tkMac.h
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMac.h,v 1.6 1999/04/16 01:51:29 stanton Exp $
+ * RCS: @(#) $Id: tkMac.h,v 1.7 1999/05/22 06:32:05 jingham Exp $
*/
#ifndef _TKMAC
@@ -49,6 +49,7 @@ typedef void (Tk_MacEmbedGetOffsetInParentProc) (Tk_Window window, Point *ulCorn
* so they can be exported.
*/
+#include "tkPlatDecls.h"
#pragma export reset
diff --git a/mac/tkMacAppInit.c b/mac/tkMacAppInit.c
index 43d3371..9d27ca7 100644
--- a/mac/tkMacAppInit.c
+++ b/mac/tkMacAppInit.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: tkMacAppInit.c,v 1.9 1999/04/28 18:18:07 redman Exp $
+ * RCS: @(#) $Id: tkMacAppInit.c,v 1.10 1999/05/22 06:32:08 jingham Exp $
*/
#include <Gestalt.h>
@@ -272,7 +272,6 @@ MacintoshInit()
Tcl_MacSetEventProc(TkMacConvertEvent);
-
return TCL_OK;
}
diff --git a/mac/tkMacBitmap.c b/mac/tkMacBitmap.c
index 0b71837..e434c26 100644
--- a/mac/tkMacBitmap.c
+++ b/mac/tkMacBitmap.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacBitmap.c,v 1.3 1999/04/16 01:51:29 stanton Exp $
+ * RCS: @(#) $Id: tkMacBitmap.c,v 1.4 1999/05/22 06:32:12 jingham Exp $
*/
#include "tkPort.h"
@@ -101,8 +101,6 @@ TkpDefineNativeBitmaps()
BuiltInIcon *builtInPtr;
NativeIcon *nativeIconPtr;
Tcl_HashTable *tablePtr;
- ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
- Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
for (builtInPtr = builtInIcons; builtInPtr->name != NULL; builtInPtr++) {
name = Tk_GetUid(builtInPtr->name);
@@ -204,7 +202,7 @@ TkpCreateNativeBitmap(
Pixmap
TkpGetNativeAppBitmap(
Display *display, /* The display. */
- char *name, /* The name of the bitmap. */
+ CONST char *name, /* The name of the bitmap. */
int *width, /* The width & height of the bitmap. */
int *height)
{
diff --git a/mac/tkMacButton.c b/mac/tkMacButton.c
index cdc609b..54dd92b 100644
--- a/mac/tkMacButton.c
+++ b/mac/tkMacButton.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: tkMacButton.c,v 1.5 1999/04/16 01:51:29 stanton Exp $
+ * RCS: @(#) $Id: tkMacButton.c,v 1.6 1999/05/22 06:32:26 jingham Exp $
*/
#include "tkButton.h"
@@ -471,7 +471,7 @@ TkpComputeButtonGeometry(
} else {
Tk_FreeTextLayout(butPtr->textLayout);
butPtr->textLayout = Tk_ComputeTextLayout(butPtr->tkfont,
- Tcl_GetString(butPtr->text), -1, butPtr->wrapLength,
+ Tcl_GetString(butPtr->textPtr), -1, butPtr->wrapLength,
butPtr->justify, 0, &butPtr->textWidth, &butPtr->textHeight);
width = butPtr->textWidth;
diff --git a/mac/tkMacClipboard.c b/mac/tkMacClipboard.c
index 75bc131..c1ec15e 100644
--- a/mac/tkMacClipboard.c
+++ b/mac/tkMacClipboard.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacClipboard.c,v 1.3 1999/04/16 01:51:30 stanton Exp $
+ * RCS: @(#) $Id: tkMacClipboard.c,v 1.4 1999/05/22 06:32:32 jingham Exp $
*/
#include "tkInt.h"
@@ -119,7 +119,7 @@ XSetSelectionOwner(
* It expects a Tk_Window, even though it only needs a Tk_Display.
*/
- tkwin = (Tk_Window)tkMainWindowList->winPtr;
+ tkwin = (Tk_Window) TkGetMainInfoList()->winPtr;
if (selection == Tk_InternAtom(tkwin, "CLIPBOARD")) {
@@ -128,7 +128,7 @@ XSetSelectionOwner(
* owner of the clipboard.
*/
- dispPtr = tkMainWindowList->winPtr->dispPtr;
+ dispPtr = TkGetMainInfoList()->winPtr->dispPtr;
if (dispPtr->clipboardActive) {
return;
}
@@ -283,9 +283,9 @@ TkSuspendClipboard()
* it needs it. (Window list NULL if quiting.)
*/
- if (tkMainWindowList != NULL) {
- Tk_ClearSelection((Tk_Window) tkMainWindowList->winPtr,
- Tk_InternAtom((Tk_Window) tkMainWindowList->winPtr,
+ if (TkGetMainInfoList() != NULL) {
+ Tk_ClearSelection((Tk_Window) TkGetMainInfoList()->winPtr,
+ Tk_InternAtom((Tk_Window) TkGetMainInfoList()->winPtr,
"CLIPBOARD"));
}