From: Jason Rumney <jasonr@gnu.org>
Date: Tue, 15 May 2007 23:02:24 +0000 (+0000)
Subject: (Fx_popup_menu): Use terminal specific mouse_position_hook.
X-Git-Tag: emacs-pretest-23.0.90~11236^2~135
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ab7006cf6efd2a3867b6a49138bddf01a6b79ac;p=emacs.git

(Fx_popup_menu): Use terminal specific mouse_position_hook.
---

diff --git a/src/w32menu.c b/src/w32menu.c
index ba29c6ae433..5f507ad76c0 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -20,14 +20,15 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
 #include <config.h>
-#include <signal.h>
 
+#include <signal.h>
 #include <stdio.h>
+
 #include "lisp.h"
-#include "termhooks.h"
 #include "keyboard.h"
 #include "keymap.h"
 #include "frame.h"
+#include "termhooks.h"
 #include "window.h"
 #include "blockinput.h"
 #include "buffer.h"
@@ -673,8 +674,8 @@ cached information about equivalent key sequences.  */)
 	  enum scroll_bar_part part;
 	  unsigned long time;
 
-	  if (mouse_position_hook)
-	    (*mouse_position_hook) (&new_f, 1, &bar_window,
+	  if (FRAME_TERMINAL (new_f)->mouse_position_hook)
+	    (*FRAME_TERMINAL (new_f)->mouse_position_hook) (&new_f, 1, &bar_window,
 				    &part, &x, &y, &time);
 	  if (new_f != 0)
 	    XSETFRAME (window, new_f);