Mercurial > hg > xemacs-beta

diff src/scrollbar-msw.c @ 288:e11d67e05968 r21-0b42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b42
author cvs
date Mon, 13 Aug 2007 10:35:54 +0200
parents 57709be46d1b
children c9fe270a4101
line wrap: on
line diff
--- a/src/scrollbar-msw.c	Mon Aug 13 10:35:07 2007 +0200
+++ b/src/scrollbar-msw.c	Mon Aug 13 10:35:54 2007 +0200
@@ -166,14 +166,15 @@
 mswindows_handle_scrollbar_event (HWND hwnd, int code, int pos)
 {
   struct frame *f;
-  Lisp_Object win;
+  Lisp_Object win, frame;
   struct scrollbar_instance *sb;
   SCROLLINFO scrollinfo;
   int vert = GetWindowLong (hwnd, GWL_STYLE) & SBS_VERT;
 
   sb = (struct scrollbar_instance *)GetWindowLong (hwnd, GWL_USERDATA);
   win = real_window (sb->mirror, 1);
-  f = XFRAME (XWINDOW (win)->frame);
+  frame = XWINDOW (win)->frame;
+  f = XFRAME (frame);
 
   inhibit_slider_size_change = code == SB_THUMBTRACK;
 
@@ -184,39 +185,36 @@
   switch (code)
     {
     case SB_LINEDOWN:
-      enqueue_misc_user_event(win,
-			      vert ? Qscrollbar_line_down : Qscrollbar_char_right,
-			      win);
+      mswindows_enqueue_misc_user_event
+	(frame, vert ? Qscrollbar_line_down : Qscrollbar_char_right, win);
       break;
 	  
     case SB_LINEUP:
-      enqueue_misc_user_event(win,
-			      vert ? Qscrollbar_line_up : Qscrollbar_char_left,
-			      win);
+      mswindows_enqueue_misc_user_event
+	(frame, vert ? Qscrollbar_line_up : Qscrollbar_char_left, win);
       break;
 	  
     case SB_PAGEDOWN:
-      enqueue_misc_user_event(win,
-			      vert ? Qscrollbar_page_down : Qscrollbar_page_right,
-			      vert ? Fcons (win, Qnil) : win);
+      mswindows_enqueue_misc_user_event
+	(win, vert ? Qscrollbar_page_down : Qscrollbar_page_right,
+	 vert ? Fcons (win, Qnil) : win);
       break;
 
     case SB_PAGEUP:
-      enqueue_misc_user_event(win,
-			      vert ? Qscrollbar_page_up : Qscrollbar_page_left,
-			      vert ? Fcons (win, Qnil) : win);
+      mswindows_enqueue_misc_user_event
+	(frame,
+	 vert ? Qscrollbar_page_up : Qscrollbar_page_left,
+	 vert ? Fcons (win, Qnil) : win);
       break;
 	  
     case SB_BOTTOM:
-      enqueue_misc_user_event(win,
-			      vert ? Qscrollbar_to_bottom : Qscrollbar_to_right,
-			      win);
+      mswindows_enqueue_misc_user_event
+	(frame, vert ? Qscrollbar_to_bottom : Qscrollbar_to_right, win);
       break;
 
     case SB_TOP:
-      enqueue_misc_user_event(win,
-			      vert ? Qscrollbar_to_top : Qscrollbar_to_left,
-			      win);
+      mswindows_enqueue_misc_user_event
+	(frame, vert ? Qscrollbar_to_top : Qscrollbar_to_left, win);
       break;
 
     case SB_THUMBTRACK:
@@ -224,10 +222,10 @@
       scrollinfo.cbSize = sizeof(SCROLLINFO);
       scrollinfo.fMask = SIF_TRACKPOS;
       GetScrollInfo (hwnd, SB_CTL, &scrollinfo);
-      enqueue_misc_user_event (win,
-			       (vert ? Qscrollbar_vertical_drag
-				: Qscrollbar_horizontal_drag),
-			       Fcons (win, make_int (scrollinfo.nTrackPos)));
+      mswindows_enqueue_misc_user_event
+	(frame,
+	 vert ? Qscrollbar_vertical_drag : Qscrollbar_horizontal_drag,
+	 Fcons (win, make_int (scrollinfo.nTrackPos)));
       break;
     }
 }