summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog11
-rw-r--r--generic/tk.decls4
-rw-r--r--generic/tk.h13
-rw-r--r--generic/tkPlatDecls.h6
-rw-r--r--macosx/tkMacOSXPort.h9
-rw-r--r--macosx/tkMacOSXSubwindows.c31
-rw-r--r--macosx/tkMacOSXWindowEvent.c4
-rw-r--r--macosx/tkMacOSXWm.c6
8 files changed, 46 insertions, 38 deletions
diff --git a/ChangeLog b/ChangeLog
index e5cc0da..cff9b9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-09 Daniel Steffen <das@users.sourceforge.net>
+
+ * generic/tk.decls: fix signature of TkMacOSXInvalClipRgns
+ * generic/tkPlatDecls.h: to use Tk_Window instead of internal
+ * macosx/tkMacOSXSubwindows.c: type TkWindow (which led to any include
+ * macosx/tkMacOSXWindowEvent.c: of public header tkMacOSX.h requiring
+ * macosx/tkMacOSXWm.c: prior include of tkInt.h)
+
+ * generic/tk.h: move TkAqua specific REDO_KEYSYM_LOOKUP define
+ * macosx/tkMacOSXPort.h: out of tk.h into platform header.
+
2006-01-25 Don Porter <dgp@users.sourceforge.net>
* library/bgerror.tcl: Updates to use Tcl 8.4 features. [Patch 1237759]
diff --git a/generic/tk.decls b/generic/tk.decls
index deece6d..7d3f5f6 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -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: tk.decls,v 1.24 2002/08/31 06:12:19 das Exp $
+# RCS: @(#) $Id: tk.decls,v 1.24.2.1 2006/02/09 19:09:43 das Exp $
library tk
@@ -1364,7 +1364,7 @@ declare 5 aqua {
}
declare 6 aqua {
- void TkMacOSXInvalClipRgns (TkWindow *winPtr)
+ void TkMacOSXInvalClipRgns (Tk_Window tkwin)
}
declare 7 aqua {
diff --git a/generic/tk.h b/generic/tk.h
index a11d207..3119f3a 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -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: tk.h,v 1.74.2.13 2005/11/27 02:44:25 das Exp $
+ * RCS: @(#) $Id: tk.h,v 1.74.2.14 2006/02/09 19:09:43 das Exp $
*/
#ifndef _TK
@@ -53,17 +53,6 @@ extern "C" {
#define TK_VERSION "8.4"
#define TK_PATCH_LEVEL "8.4.12"
-/*
- * The following definitions set up the proper options for Macintosh
- * compilers. We use this method because there is no autoconf equivalent.
- */
-
-#if defined(MAC_TCL) || defined(MAC_OSX_TK)
-# ifndef REDO_KEYSYM_LOOKUP
-# define REDO_KEYSYM_LOOKUP
-# endif
-#endif
-
#ifndef _TCL
# include <tcl.h>
# if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION != 4)
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 00cad28..5d85c8f 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.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: tkPlatDecls.h,v 1.7 2002/08/31 06:12:23 das Exp $
+ * RCS: @(#) $Id: tkPlatDecls.h,v 1.7.2.1 2006/02/09 19:09:43 das Exp $
*/
#ifndef _TKPLATDECLS
@@ -104,7 +104,7 @@ EXTERN void TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin,
int x, int y, int width, int height,
int flags));
/* 6 */
-EXTERN void TkMacOSXInvalClipRgns _ANSI_ARGS_((TkWindow * winPtr));
+EXTERN void TkMacOSXInvalClipRgns _ANSI_ARGS_((Tk_Window tkwin));
/* 7 */
EXTERN GWorldPtr TkMacOSXGetDrawablePort _ANSI_ARGS_((
Drawable drawable));
@@ -149,7 +149,7 @@ typedef struct TkPlatStubs {
void (*tkMacOSXInitMenus) _ANSI_ARGS_((Tcl_Interp * interp)); /* 3 */
void (*tkMacOSXInitAppleEvents) _ANSI_ARGS_((Tcl_Interp * interp)); /* 4 */
void (*tkGenWMConfigureEvent) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); /* 5 */
- void (*tkMacOSXInvalClipRgns) _ANSI_ARGS_((TkWindow * winPtr)); /* 6 */
+ void (*tkMacOSXInvalClipRgns) _ANSI_ARGS_((Tk_Window tkwin)); /* 6 */
GWorldPtr (*tkMacOSXGetDrawablePort) _ANSI_ARGS_((Drawable drawable)); /* 7 */
ControlRef (*tkMacOSXGetRootControl) _ANSI_ARGS_((Drawable drawable)); /* 8 */
void (*tk_MacOSXSetupTkNotifier) _ANSI_ARGS_((void)); /* 9 */
diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h
index 97e3293..81f190b 100644
--- a/macosx/tkMacOSXPort.h
+++ b/macosx/tkMacOSXPort.h
@@ -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: tkMacOSXPort.h,v 1.3.2.3 2005/11/27 02:36:46 das Exp $
+ * RCS: @(#) $Id: tkMacOSXPort.h,v 1.3.2.4 2006/02/09 19:09:43 das Exp $
*/
#ifndef _TKMACPORT
@@ -145,6 +145,13 @@ extern int strcasecmp _ANSI_ARGS_((CONST char *s1,
extern int strncasecmp _ANSI_ARGS_((CONST char *s1,
CONST char *s2, size_t n));
#endif
+
+/*
+ * The following define causes Tk to use its internal keysym hash table
+ */
+
+#define REDO_KEYSYM_LOOKUP
+
/*
* Defines for X functions that are used by Tk but are treated as
* no-op functions on the Macintosh.
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 1093a3f..d587a1a 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.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: tkMacOSXSubwindows.c,v 1.2.2.7 2005/11/27 02:36:46 das Exp $
+ * RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.2.2.8 2006/02/09 19:09:43 das Exp $
*/
#include "tkInt.h"
@@ -144,7 +144,7 @@ XDestroyWindow(
TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW);
}
if (macWin->winPtr->parentPtr != NULL) {
- TkMacOSXInvalClipRgns(macWin->winPtr->parentPtr);
+ TkMacOSXInvalClipRgns((Tk_Window) macWin->winPtr->parentPtr);
}
DisposeRgn(macWin->clipRgn);
DisposeRgn(macWin->aboveClipRgn);
@@ -279,7 +279,7 @@ XMapWindow(
event.xmap.override_redirect = macWin->winPtr->atts.override_redirect;
Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
} else {
- TkMacOSXInvalClipRgns(macWin->winPtr->parentPtr);
+ TkMacOSXInvalClipRgns((Tk_Window) macWin->winPtr->parentPtr);
}
/*
@@ -357,7 +357,7 @@ XUnmapWindow(
*/
SetGWorld(destPort, NULL);
TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW); /* TODO: may not be valid */
- TkMacOSXInvalClipRgns(macWin->winPtr->parentPtr);
+ TkMacOSXInvalClipRgns((Tk_Window) macWin->winPtr->parentPtr);
}
}
@@ -407,7 +407,7 @@ XResizeWindow(
SizeWindow(GetWindowFromPort(destPort),
(short) width, (short) height, false);
TkMacOSXInvalidateWindow(macWin, TK_WINDOW_ONLY);
- TkMacOSXInvalClipRgns(macWin->winPtr);
+ TkMacOSXInvalClipRgns((Tk_Window) macWin->winPtr);
}
} else {
int deltaX, deltaY;
@@ -425,7 +425,7 @@ XResizeWindow(
if (havePort) {
SetPort(destPort);
- TkMacOSXInvalClipRgns(macParent->winPtr);
+ TkMacOSXInvalClipRgns((Tk_Window) macParent->winPtr);
TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW);
}
deltaX = macParent->xOff +
@@ -459,7 +459,7 @@ XResizeWindow(
if (havePort) {
SetPort(destPort);
- TkMacOSXInvalClipRgns(macParent->winPtr);
+ TkMacOSXInvalClipRgns((Tk_Window) macParent->winPtr);
TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW);
}
deltaX = - macWin->xOff;
@@ -563,7 +563,7 @@ XMoveResizeWindow(
/* TODO: is the following right? */
TkMacOSXInvalidateWindow(macWin, TK_WINDOW_ONLY);
- TkMacOSXInvalClipRgns(macWin->winPtr);
+ TkMacOSXInvalClipRgns((Tk_Window) macWin->winPtr);
}
} else {
int deltaX, deltaY, parentBorderwidth;
@@ -598,7 +598,7 @@ XMoveResizeWindow(
if (havePort) {
SetPort( destPort);
- TkMacOSXInvalClipRgns(macParent->winPtr);
+ TkMacOSXInvalClipRgns((Tk_Window) macParent->winPtr);
TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW);
}
@@ -674,7 +674,7 @@ XMoveWindow(
/* TODO: is the following right? */
TkMacOSXInvalidateWindow(macWin, TK_WINDOW_ONLY);
- TkMacOSXInvalClipRgns(macWin->winPtr);
+ TkMacOSXInvalClipRgns((Tk_Window) macWin->winPtr);
}
} else {
int deltaX, deltaY, parentBorderwidth;
@@ -708,7 +708,7 @@ XMoveWindow(
if (havePort) {
SetPort(destPort);
- TkMacOSXInvalClipRgns(macParent->winPtr);
+ TkMacOSXInvalClipRgns((Tk_Window) macParent->winPtr);
TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW);
}
@@ -857,7 +857,7 @@ XConfigureWindow(
destPort = TkMacOSXGetDrawablePort(w);
if (destPort != NULL) {
SetPort( destPort);
- TkMacOSXInvalClipRgns(winPtr->parentPtr);
+ TkMacOSXInvalClipRgns((Tk_Window) winPtr->parentPtr);
TkMacOSXWinBounds(winPtr, &bounds);
InvalWindowRect(GetWindowFromPort(destPort),&bounds);
}
@@ -1237,8 +1237,9 @@ TkMacOSXGetRootControl(
void
TkMacOSXInvalClipRgns(
- TkWindow *winPtr)
+ Tk_Window tkwin)
{
+ TkWindow *winPtr = (TkWindow *) tkwin;
TkWindow *childPtr;
/*
@@ -1258,7 +1259,7 @@ TkMacOSXInvalClipRgns(
childPtr = winPtr->childList;
while (childPtr != NULL) {
if (!Tk_IsTopLevel(childPtr) && Tk_IsMapped(childPtr)) {
- TkMacOSXInvalClipRgns(childPtr);
+ TkMacOSXInvalClipRgns((Tk_Window) childPtr);
}
childPtr = childPtr->nextPtr;
}
@@ -1271,7 +1272,7 @@ TkMacOSXInvalClipRgns(
childPtr = TkpGetOtherWindow(winPtr);
if (childPtr != NULL && Tk_IsMapped(childPtr)) {
- TkMacOSXInvalClipRgns(childPtr);
+ TkMacOSXInvalClipRgns((Tk_Window) childPtr);
}
/*
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 9f82532..7652376 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -54,7 +54,7 @@
* software in accordance with the terms specified in this
* license.
*
- * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.3.2.7 2005/12/08 05:04:35 das Exp $
+ * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.3.2.8 2006/02/09 19:09:43 das Exp $
*/
#include "tkMacOSXInt.h"
@@ -623,7 +623,7 @@ TkGenWMConfigureEvent(
winPtr->changes.y = y;
winPtr->changes.width = width;
winPtr->changes.height = height;
- TkMacOSXInvalClipRgns(winPtr);
+ TkMacOSXInvalClipRgns(tkwin);
}
/*
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 73a9839..977a0e5 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.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: tkMacOSXWm.c,v 1.7.2.15 2005/12/01 18:31:43 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.7.2.16 2006/02/09 19:09:43 das Exp $
*/
#include <Carbon/Carbon.h>
@@ -4406,7 +4406,7 @@ TkMacOSXGrowToplevel(
LoWord(growResult), HiWord(growResult), true);
SetPort( GetWindowPort(whichWindow));
InvalWindowRect(whichWindow,&portRect); /* TODO: may not be needed */
- TkMacOSXInvalClipRgns(winPtr);
+ TkMacOSXInvalClipRgns((Tk_Window) winPtr);
TkGenWMConfigureEvent((Tk_Window) winPtr, -1, -1,
(int) LoWord(growResult), (int) HiWord(growResult),
TK_SIZE_CHANGED);
@@ -4595,7 +4595,7 @@ TkMacOSXZoomToplevel(
ZoomWindow(whichWindow, zoomPart, false);
InvalWindowRect(whichWindow,&portRect);
- TkMacOSXInvalClipRgns((TkWindow *) tkwin);
+ TkMacOSXInvalClipRgns(tkwin);
LocalToGlobal(&location);
TkMacOSXWindowOffset(whichWindow, &xOffset, &yOffset);
generated by cgit v0.12 at 2024-11-10 18:18:17 (GMT)