From: Juanma Barranquero <lekktu@gmail.com>
Date: Tue, 27 May 2003 22:34:58 +0000 (+0000)
Subject: Add missing code from previous patch by David Ponce.
X-Git-Tag: ttn-vms-21-2-B4~9914
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e471b24112a51d3fd4c768af6db324e763cb0a5d;p=emacs.git

Add missing code from previous patch by David Ponce.
---

diff --git a/src/w32term.c b/src/w32term.c
index 1c4e6803906..0087a00b56d 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4451,7 +4451,7 @@ w32_read_socket (sd, bufp, numchars, expected)
 		  }
 	      }
 
-	    button = ( GET_WHEEL_DELTA_WPARAM (msg.msg.wParam) < 0 )? 4 : 3;
+	    button = (GET_WHEEL_DELTA_WPARAM (msg.msg.wParam) < 0)? 4 : 3;
 
 	    if (up)
 	      {
@@ -4816,27 +4816,12 @@ w32_read_socket (sd, bufp, numchars, expected)
 	  break;
 
 	default:
-	  /* Check for messages registered at runtime. */
+	  /* Check for messages registered at runtime.  */
 	  if (msg.msg.message == msh_mousewheel)
 	    {
-	      if (dpyinfo->grabbed && last_mouse_frame
-		  && FRAME_LIVE_P (last_mouse_frame))
-		f = last_mouse_frame;
-	      else
-		f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
-
-	      if (f)
-		{
-		  if ((!dpyinfo->w32_focus_frame
-		       || f == dpyinfo->w32_focus_frame)
-		      && (numchars >= 1))
-		    {
-		      construct_mouse_wheel (bufp, &msg, f);
-		      bufp++;
-		      count++;
-		      numchars--;
-		    }
-		}
+	      /* Forward MSH_MOUSEWHEEL as WM_MOUSEWHEEL.  */
+	      msg.msg.message == WM_MOUSEWHEEL;
+	      prepend_msg (&msg);
 	    }
 	  break;
 	}