summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorhobbs <hobbs>2005-02-28 22:11:57 (GMT)
committerhobbs <hobbs>2005-02-28 22:11:57 (GMT)
commit92c9bd74096d941af4a349b26b5923597447c99b (patch)
tree61a110427b0ecfd0e9237318a25582b7391773a5 /win
parentbf5820e2248feadca3d6a163aa562453a38791d2 (diff)
downloadtk-92c9bd74096d941af4a349b26b5923597447c99b.zip
tk-92c9bd74096d941af4a349b26b5923597447c99b.tar.gz
tk-92c9bd74096d941af4a349b26b5923597447c99b.tar.bz2
* win/tkWinX.c (GenerateXEvent): correct %A translation on
MouseWheel [Bug 1118340]
Diffstat (limited to 'win')
-rw-r--r--win/tkWinX.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/win/tkWinX.c b/win/tkWinX.c
index b8e8209..a0922c6 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinX.c,v 1.43 2005/01/31 04:08:32 chengyemao Exp $
+ * RCS: @(#) $Id: tkWinX.c,v 1.44 2005/02/28 22:11:57 hobbs Exp $
*/
#include "tkWinInt.h"
@@ -1056,14 +1056,14 @@ GenerateXEvent(hwnd, message, wParam, lParam)
Tk_InternAtom((Tk_Window)winPtr, "CLIPBOARD");
event.xselectionclear.time = TkpGetMS();
break;
-
+
case WM_MOUSEWHEEL:
/*
* The mouse wheel event is closer to a key event than a
* mouse event in that the message is sent to the window
* that has focus.
*/
-
+
case WM_CHAR:
case WM_SYSKEYDOWN:
case WM_SYSKEYUP:
@@ -1078,7 +1078,7 @@ GenerateXEvent(hwnd, message, wParam, lParam)
/*
* Compute the screen and window coordinates of the event.
*/
-
+
msgPos = GetMessagePos();
rootPoint = MAKEPOINTS(msgPos);
clientPoint.x = rootPoint.x;
@@ -1110,11 +1110,14 @@ GenerateXEvent(hwnd, message, wParam, lParam)
* We have invented a new X event type to handle
* this event. It still uses the KeyPress struct.
* However, the keycode field has been overloaded
- * to hold the zDelta of the wheel.
+ * to hold the zDelta of the wheel. Set nbytes to 0
+ * to prevent conversion of the keycode to a keysym
+ * in TkpGetString. [Bug 1118340].
*/
-
+
event.type = MouseWheelEvent;
event.xany.send_event = -1;
+ event.xany.nbytes = 0;
event.xkey.keycode = (short) HIWORD(wParam);
break;
case WM_SYSKEYDOWN: