# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1188942059 0
# Node ID f65f55d787ec7604d3ba2393f06fd460cfafd334
# Parent  eed0e69910d6b46ddde676f39259928c86253ade
Horizontal mouse wheel support:
(w32_wnd_proc) <WM_DROPFILES>: Merge with WM_MOUSEWHEEL.
<WM_MOUSEHWHEEL>: Pass new system message to lisp.

MULTI_KBOARD support:
(x_create_tip_frame) [MULTI_KBOARD]: Get keyboard from
terminal.

diff -r eed0e69910d6 -r f65f55d787ec src/w32fns.c
--- a/src/w32fns.c	Tue Sep 04 21:39:01 2007 +0000
+++ b/src/w32fns.c	Tue Sep 04 21:40:59 2007 +0000
@@ -3383,17 +3383,21 @@
       return 0;
 
     case WM_MOUSEWHEEL:
-      wmsg.dwModifiers = w32_get_modifiers ();
-      my_post_msg (&wmsg, hwnd, msg, wParam, lParam);
-      signal_user_input ();
-      return 0;
-
     case WM_DROPFILES:
       wmsg.dwModifiers = w32_get_modifiers ();
       my_post_msg (&wmsg, hwnd, msg, wParam, lParam);
       signal_user_input ();
       return 0;
 
+    case WM_MOUSEHWHEEL:
+      wmsg.dwModifiers = w32_get_modifiers ();
+      my_post_msg (&wmsg, hwnd, msg, wParam, lParam);
+      signal_user_input ();
+      /* Non-zero must be returned when WM_MOUSEHWHEEL messages are
+         handled, to prevent the system trying to handle it by faking
+         scroll bar events.  */
+      return 1;
+
     case WM_TIMER:
       /* Flush out saved messages if necessary. */
       if (wParam == mouse_button_timer)
@@ -7238,7 +7242,7 @@
   Vx_resource_name = Vinvocation_name;
 
 #ifdef MULTI_KBOARD
-  kb = dpyinfo->kboard;
+  kb = dpyinfo->terminal->kboard;
 #else
   kb = &the_only_kboard;
 #endif