summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tk.h16
2 files changed, 12 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index b3d0bc0..3a5d5a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-06 Joe English <jenglish@users.sourceforge.net>
+
+ * generic/tk.h: Fix for [Bug 2010422]: account for X11 changing
+ constant LASTEvent.
+
2008-06-18 Daniel Steffen <das@users.sourceforge.net>
* macosx/tkMacOSXCarbonEvents.c: fix debug carbon event tracing;
diff --git a/generic/tk.h b/generic/tk.h
index 1f1027c..1e90659 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.74.2.22 2008/04/07 19:17:54 dgp Exp $
+ * RCS: @(#) $Id: tk.h,v 1.74.2.23 2008/08/06 16:54:48 jenglish Exp $
*/
#ifndef _TK
@@ -635,18 +635,16 @@ 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 MouseWheelMask (1L << 28)
+#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