summaryrefslogtreecommitdiffstats
path: root/generic/tk.h
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2008-08-05 20:31:52 (GMT)
committerjenglish <jenglish@flightlab.com>2008-08-05 20:31:52 (GMT)
commit590ea2e98630e409be6461594034b9806a8e3257 (patch)
treea9dcb61e888fc0fa2cdf48e3a2a395dd3234d326 /generic/tk.h
parentacf4293cf37a201ebfa87e6e659bf7cfc9535963 (diff)
downloadtk-590ea2e98630e409be6461594034b9806a8e3257.zip
tk-590ea2e98630e409be6461594034b9806a8e3257.tar.gz
tk-590ea2e98630e409be6461594034b9806a8e3257.tar.bz2
Fix for [Bug 2010422] "no event type or button # or keysym
while executing "bind Listbox <MouseWheel> [...]". This allows Tk to compile and run against newer X11 headers where the protocol constant LastEvent has changed.
Diffstat (limited to 'generic/tk.h')
-rw-r--r--generic/tk.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/generic/tk.h b/generic/tk.h
index 3a8fb75..b56ba7f 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.109.2.3 2008/07/31 04:20:20 dgp Exp $
+ * RCS: @(#) $Id: tk.h,v 1.109.2.4 2008/08/05 20:31:53 jenglish Exp $
*/
#ifndef _TK
@@ -627,17 +627,15 @@ typedef struct Tk_GeomMgr {
*---------------------------------------------------------------------------
*/
-#define VirtualEvent (LASTEvent)
-#define ActivateNotify (LASTEvent + 1)
-#define DeactivateNotify (LASTEvent + 2)
-#define MouseWheelEvent (LASTEvent + 3)
-#define TK_LASTEVENT (LASTEvent + 4)
+#define VirtualEvent (MappingNotify + 1)
+#define ActivateNotify (MappingNotify + 2)
+#define DeactivateNotify (MappingNotify + 3)
+#define MouseWheelEvent (MappingNotify + 4)
+#define TK_LASTEVENT (MappingNotify + 5)
#define MouseWheelMask (1L << 28)
-
#define ActivateMask (1L << 29)
#define VirtualEventMask (1L << 30)
-#define TK_LASTEVENT (LASTEvent + 4)
/*
* A virtual event shares most of its fields with the XKeyEvent and