summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-05-11 12:12:49 (GMT)
committernijtmans <nijtmans>2010-05-11 12:12:49 (GMT)
commitede9fc2f74a2e9aa5084e18c93d903e81f0f3303 (patch)
tree1a71cc0e56c633acfe0fb2e4a5af9d1ea1bce8bd /generic
parent44d12a1d5aa9b0103f0c3bea1ed81b59d4d383d1 (diff)
downloadtk-ede9fc2f74a2e9aa5084e18c93d903e81f0f3303.zip
tk-ede9fc2f74a2e9aa5084e18c93d903e81f0f3303.tar.gz
tk-ede9fc2f74a2e9aa5084e18c93d903e81f0f3303.tar.bz2
Consistent use of variable names in RestrictEvent
API documentation and implementation: Use 'prev' in stead of 'old', and 'arg' in stead of 'clientData' everywhere, just as in tkEvent.c.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkGrab.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkGrab.c b/generic/tkGrab.c
index 67cf216..8056b2c 100644
--- a/generic/tkGrab.c
+++ b/generic/tkGrab.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: tkGrab.c,v 1.20 2010/02/13 13:47:49 nijtmans Exp $
+ * RCS: @(#) $Id: tkGrab.c,v 1.21 2010/05/11 12:12:50 nijtmans Exp $
*/
#include "tkInt.h"
@@ -152,7 +152,7 @@ static const unsigned int buttonStates[] = {
static void EatGrabEvents(TkDisplay *dispPtr, unsigned int serial);
static TkWindow * FindCommonAncestor(TkWindow *winPtr1,
TkWindow *winPtr2, int *countPtr1, int *countPtr2);
-static Tk_RestrictAction GrabRestrictProc(ClientData arg, XEvent *eventPtr);
+static Tk_RestrictProc GrabRestrictProc;
static int GrabWinEventProc(Tcl_Event *evPtr, int flags);
static void MovePointer2(TkWindow *sourcePtr, TkWindow *destPtr,
int mode, int leaveEvents, int EnterEvents);
@@ -1242,18 +1242,18 @@ EatGrabEvents(
unsigned int serial) /* Only discard events that have a serial
* number at least this great. */
{
- Tk_RestrictProc *oldProc;
+ Tk_RestrictProc *prevProc;
GrabInfo info;
- ClientData oldArg, dummy;
+ ClientData prevArg;
info.display = dispPtr->display;
info.serial = serial;
TkpSync(info.display);
- oldProc = Tk_RestrictEvents(GrabRestrictProc, &info, &oldArg);
+ prevProc = Tk_RestrictEvents(GrabRestrictProc, &info, &prevArg);
while (Tcl_ServiceEvent(TCL_WINDOW_EVENTS)) {
/* EMPTY */
}
- Tk_RestrictEvents(oldProc, oldArg, &dummy);
+ Tk_RestrictEvents(prevProc, prevArg, &prevArg);
}
/*