(mouse-wheel-down-event, mouse-wheel-up-event):

Default to new wheel-up and wheel-down events on Windows.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d936d62..fd22af8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-06-01  Jason Rumney  <jasonr@gnu.org>
+
+       * mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event):
+       Default to new wheel-up and wheel-down events on Windows.
+
+       * term/w32-win.el: No need to bind wheel events specially.
+
 2003-06-01  Michael Kifer  <kifer@cs.stonybrook.edu>
        
        * desktop.el (desktop-create-buffer): Added (desktop-first-buffer) to

diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 850642c..2ebb10c 100644 (file)
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -58,8 +58,10 @@
                         'mouse-wheel-down-event)
 (defcustom mouse-wheel-down-event
   ;; In the latest versions of XEmacs, we could just use mouse-%s as well.
-  (intern (format (if (featurep 'xemacs) "button%s" "mouse-%s")
-                 mouse-wheel-down-button))
+  (if (eq system-type 'windows-nt)
+      'wheel-up
+    (intern (format (if (featurep 'xemacs) "button%s" "mouse-%s")
+                   mouse-wheel-down-button)))
   "Event used for scrolling down."
   :group 'mouse
   :type 'symbol
@@ -70,8 +72,10 @@
                         'mouse-wheel-up-event)
 (defcustom mouse-wheel-up-event
   ;; In the latest versions of XEmacs, we could just use mouse-%s as well.
-  (intern (format (if (featurep 'xemacs) "button%s" "mouse-%s")
-                 mouse-wheel-up-button))
+  (if (eq system-type 'windows-nt)
+      'wheel-down
+    (intern (format (if (featurep 'xemacs) "button%s" "mouse-%s")
+                   mouse-wheel-up-button)))
   "Event used for scrolling down."
   :group 'mouse
   :type 'symbol