Merge changes from emacs-23 branch.

[gnu-emacs] / src / xterm.h

diff --git a/src/xterm.h b/src/xterm.h
index b22c225fed7189a66d4db8d0fe8df53919e0209b..5c1213d2bf1ba48e07d85d41396a0f7ad4949f76 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -381,12 +381,15 @@ extern int use_xim;
 #endif
 
 /* This checks to make sure we have a display.  */
+
 extern void check_x (void);
 
 extern struct frame *x_window_to_frame (struct x_display_info *, int);
 
 extern struct frame *x_any_window_to_frame (struct x_display_info *, int);
-extern struct frame *x_menubar_window_to_frame (struct x_display_info *, int);
+extern struct frame *x_menubar_window_to_frame (struct x_display_info *,
+                                               XEvent *);
+
 extern struct frame *x_top_window_to_frame (struct x_display_info *, int);
 
 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)