summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXPort.h9
-rw-r--r--macosx/tkMacOSXSubwindows.c31
-rw-r--r--macosx/tkMacOSXWindowEvent.c4
-rw-r--r--macosx/tkMacOSXWm.c6
4 files changed, 29 insertions, 21 deletions
diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h
index 09a5cf3..c43fcce 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.6 2005/11/27 02:36:15 das Exp $
+ * RCS: @(#) $Id: tkMacOSXPort.h,v 1.7 2006/02/09 19:08:51 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 f470327..3fcee67 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.10 2005/11/27 02:36:15 das Exp $
+ * RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.11 2006/02/09 19:08:50 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 0fa938b..8b84b69 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.9 2005/12/01 06:24:16 hobbs Exp $
+ * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.10 2006/02/09 19:08:50 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 0a5fd22..3cc0444 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.21 2005/11/27 02:36:15 das Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.22 2006/02/09 19:08:50 das Exp $
*/
#include <Carbon/Carbon.h>
@@ -4501,7 +4501,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);
@@ -4690,7 +4690,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-07 23:03:55 (GMT)