| Subject: | [PATCH] upstream fix for X11 LASTEvent (tk cvs core-8-4-branch) |
| Date: | Thu, 18 Sep 2008 06:37:31 +0000 |
| To: | bug-Tk [...] rt.cpan.org |
| From: | Alexey Tourbin <at [...] altlinux.ru> |
2008-08-06 Joe English <jenglish@users.sourceforge.net>
* generic/tk.h: Fix for [Bug 2010422]: account for X11 changing
constant LASTEvent.
This fixes problems like this:
t/autoload...................no event type or button # or keysym at /usr/src/RPM/BUILD/Tk-804.028/blib/lib/Tk/Widget.pm line 1105.
at /usr/src/RPM/BUILD/Tk-804.028/blib/lib/Tk/Widget.pm line 203
dubious
Test returned status 2 (wstat 512, 0x200)
DIED. FAILED tests 4-5
---
pTk/mTk/generic/tk.h | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/pTk/mTk/generic/tk.h b/pTk/mTk/generic/tk.h
index 967c97d..24078e3 100644
--- a/pTk/mTk/generic/tk.h
+++ b/pTk/mTk/generic/tk.h
@@ -677,18 +677,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
--
1.5.6.5.GIT