Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
109443:9e514d1076b4 | 109445:051595eb9b58 |
---|---|
379 /* Whether or not to use XIM if we have it. */ | 379 /* Whether or not to use XIM if we have it. */ |
380 extern int use_xim; | 380 extern int use_xim; |
381 #endif | 381 #endif |
382 | 382 |
383 /* This checks to make sure we have a display. */ | 383 /* This checks to make sure we have a display. */ |
384 | |
384 extern void check_x (void); | 385 extern void check_x (void); |
385 | 386 |
386 extern struct frame *x_window_to_frame (struct x_display_info *, int); | 387 extern struct frame *x_window_to_frame (struct x_display_info *, int); |
387 | 388 |
388 extern struct frame *x_any_window_to_frame (struct x_display_info *, int); | 389 extern struct frame *x_any_window_to_frame (struct x_display_info *, int); |
389 extern struct frame *x_menubar_window_to_frame (struct x_display_info *, int); | 390 extern struct frame *x_menubar_window_to_frame (struct x_display_info *, |
391 XEvent *); | |
392 | |
390 extern struct frame *x_top_window_to_frame (struct x_display_info *, int); | 393 extern struct frame *x_top_window_to_frame (struct x_display_info *, int); |
391 | 394 |
392 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) | 395 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) |
393 #define x_any_window_to_frame x_window_to_frame | 396 #define x_any_window_to_frame x_window_to_frame |
394 #define x_top_window_to_frame x_window_to_frame | 397 #define x_top_window_to_frame x_window_to_frame |