Mercurial > emacs
diff src/xterm.h @ 109445:051595eb9b58
Merge changes from emacs-23 branch.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 16 Jul 2010 11:42:15 -0400 |
| parents | a08a6559b47b 60266cf487b0 |
| children | 05e7e7c46ff0 |
line wrap: on
line diff
--- a/src/xterm.h Fri Jul 16 14:09:55 2010 +0200 +++ b/src/xterm.h Fri Jul 16 11:42:15 2010 -0400 @@ -381,12 +381,15 @@ #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)