69 lines
2.2 KiB
Diff
69 lines
2.2 KiB
Diff
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
|
|
index 03e7283..25bc504 100644
|
|
--- a/generic/tkEvent.c
|
|
+++ b/generic/tkEvent.c
|
|
@@ -245,16 +245,10 @@ InvokeFocusHandlers(
|
|
}
|
|
|
|
/*
|
|
- * MouseWheel events are not focus specific on Mac OS X.
|
|
+ * Only key-related events are directed according to the focus.
|
|
*/
|
|
|
|
-#ifdef MAC_OSX_TK
|
|
-#define FOCUS_DIRECTED_EVENT_MASK (KeyPressMask|KeyReleaseMask)
|
|
-#else
|
|
-#define FOCUS_DIRECTED_EVENT_MASK (KeyPressMask|KeyReleaseMask|MouseWheelMask)
|
|
-#endif
|
|
-
|
|
- if (mask & FOCUS_DIRECTED_EVENT_MASK) {
|
|
+ if (mask & (KeyPressMask|KeyReleaseMask)) {
|
|
(*winPtrPtr)->dispPtr->lastEventTime = eventPtr->xkey.time;
|
|
*winPtrPtr = TkFocusKeyEvent(*winPtrPtr, eventPtr);
|
|
if (*winPtrPtr == NULL) {
|
|
@@ -738,7 +732,7 @@ InvokeGenericHandlers(
|
|
int done;
|
|
|
|
tsdPtr->handlersActive++;
|
|
- done = (*curPtr->proc)(curPtr->clientData, eventPtr);
|
|
+ done = curPtr->proc(curPtr->clientData, eventPtr);
|
|
tsdPtr->handlersActive--;
|
|
if (done) {
|
|
return done;
|
|
@@ -1346,7 +1340,7 @@ Tk_HandleEvent(
|
|
for (handlerPtr = winPtr->handlerList; handlerPtr != NULL; ) {
|
|
if ((handlerPtr->mask & mask) != 0) {
|
|
ip.nextHandler = handlerPtr->nextPtr;
|
|
- (*(handlerPtr->proc))(handlerPtr->clientData, eventPtr);
|
|
+ handlerPtr->proc(handlerPtr->clientData, eventPtr);
|
|
handlerPtr = ip.nextHandler;
|
|
} else {
|
|
handlerPtr = handlerPtr->nextPtr;
|
|
@@ -1743,7 +1737,7 @@ WindowEventProc(
|
|
return 0;
|
|
}
|
|
if (tsdPtr->restrictProc != NULL) {
|
|
- result = (*tsdPtr->restrictProc)(tsdPtr->restrictArg, &wevPtr->event);
|
|
+ result = tsdPtr->restrictProc(tsdPtr->restrictArg, &wevPtr->event);
|
|
if (result != TK_PROCESS_EVENT) {
|
|
if (result == TK_DEFER_EVENT) {
|
|
return 0;
|
|
@@ -2059,7 +2053,7 @@ TkFinalize(
|
|
|
|
firstExitPtr = exitPtr->nextPtr;
|
|
Tcl_MutexUnlock(&exitMutex);
|
|
- (*exitPtr->proc)(exitPtr->clientData);
|
|
+ exitPtr->proc(exitPtr->clientData);
|
|
ckfree((char *) exitPtr);
|
|
Tcl_MutexLock(&exitMutex);
|
|
}
|
|
@@ -2109,7 +2103,7 @@ TkFinalizeThread(
|
|
*/
|
|
|
|
tsdPtr->firstExitPtr = exitPtr->nextPtr;
|
|
- (*exitPtr->proc)(exitPtr->clientData);
|
|
+ exitPtr->proc(exitPtr->clientData);
|
|
ckfree((char *) exitPtr);
|
|
}
|
|
}
|