diff options
| author | ericm <ericm> | 2000-11-22 01:49:37 (GMT) |
|---|---|---|
| committer | ericm <ericm> | 2000-11-22 01:49:37 (GMT) |
| commit | 31e9ab3d0310055f094cbcfa64af7e6834555cb5 (patch) | |
| tree | b3d9ff19b6b8294780db27da55671e4ef2f9fd75 /generic/tkBind.c | |
| parent | 5fb60902d139dbaa22360245c548fbdbfa0e28fa (diff) | |
| download | tk-31e9ab3d0310055f094cbcfa64af7e6834555cb5.zip tk-31e9ab3d0310055f094cbcfa64af7e6834555cb5.tar.gz tk-31e9ab3d0310055f094cbcfa64af7e6834555cb5.tar.bz2 | |
Overall change: Implemented TIP 5, which exports
TkClassProcs/TkSetClassProcs as Tk_ClassProcs/Tk_SetClassProcs,
adding a size field to Tk_ClassProcs to allow for future
expansion, and renaming the geometryProc to worldChangedProc,
which is more in keeping with the actual use of the callback.
See ChangeLog for details.
Diffstat (limited to 'generic/tkBind.c')
| -rw-r--r-- | generic/tkBind.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c index e105d4d..71e5db1 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -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: tkBind.c,v 1.13 2000/04/19 01:06:50 ericm Exp $ + * RCS: @(#) $Id: tkBind.c,v 1.14 2000/11/22 01:49:37 ericm Exp $ */ #include "tkPort.h" @@ -1426,7 +1426,7 @@ Tk_BindEvent(bindingTable, eventPtr, tkwin, numObjects, objectPtr) PendingBinding staticPending; TkWindow *winPtr = (TkWindow *)tkwin; PatternTableKey key; - + Tk_ClassModalProc *modalProc; /* * Ignore events on windows that don't have names: these are windows * like wrapper windows that shouldn't be visible to the @@ -1805,7 +1805,10 @@ Tk_BindEvent(bindingTable, eventPtr, tkwin, numObjects, objectPtr) winPtr->flags = (winPtr->flags & (unsigned int) ~TK_DEFER_MODAL) | (flags & TK_DEFER_MODAL); if (deferModal) { - (*winPtr->classProcsPtr->modalProc)(tkwin, eventPtr); + modalProc = Tk_GetClassProc(winPtr->classProcsPtr, modalProc); + if (modalProc != NULL) { + (*modalProc)(tkwin, eventPtr); + } } } |