Mercurial > emacs

comparison src/w32fns.c @ 109303:c17b03e52a4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge changes from emacs-23 branch.
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 10 Jul 2010 15:01:01 -0400
parents 60516122d066
children 051595eb9b58
comparison
equal deleted inserted replaced
109191:379a5ad9f30b 109303:c17b03e52a4a
286 /* The delay (milliseconds) before a menu is freed after WM_EXITMENULOOP 286 /* The delay (milliseconds) before a menu is freed after WM_EXITMENULOOP
287 is received. */ 287 is received. */
288 #define MENU_FREE_DELAY 1000 288 #define MENU_FREE_DELAY 1000
289 static unsigned menu_free_timer = 0; 289 static unsigned menu_free_timer = 0;
290 290
291 /* In dispnew.c */
292
293 extern Lisp_Object Vwindow_system_version;
294
291 /* The below are defined in frame.c. */ 295 /* The below are defined in frame.c. */
292 296
293 extern Lisp_Object Vmenu_bar_mode, Vtool_bar_mode; 297 extern Lisp_Object Vmenu_bar_mode, Vtool_bar_mode;
294 extern Lisp_Object Vwindow_system_version; 298 extern Lisp_Object Vwindow_system_version;
299 extern Lisp_Object Qtooltip;
295 300
296 #ifdef GLYPH_DEBUG 301 #ifdef GLYPH_DEBUG
297 int image_cache_refcount, dpyinfo_refcount; 302 int image_cache_refcount, dpyinfo_refcount;
298 #endif 303 #endif
299 304
5474 FRAME_LINES (f) = 0; 5479 FRAME_LINES (f) = 0;
5475 SET_FRAME_COLS (f, 0); 5480 SET_FRAME_COLS (f, 0);
5476 change_frame_size (f, height, width, 1, 0, 0); 5481 change_frame_size (f, height, width, 1, 0, 0);
5477 5482
5478 /* Add `tooltip' frame parameter's default value. */ 5483 /* Add `tooltip' frame parameter's default value. */
5479 if (NILP (Fframe_parameter (frame, intern ("tooltip")))) 5484 if (NILP (Fframe_parameter (frame, Qtooltip)))
5480 Fmodify_frame_parameters (frame, Fcons (Fcons (intern ("tooltip"), Qt), 5485 Fmodify_frame_parameters (frame, Fcons (Fcons (Qtooltip, Qt), Qnil));
5481 Qnil));
5482 5486
5483 /* Set up faces after all frame parameters are known. This call 5487 /* Set up faces after all frame parameters are known. This call
5484 also merges in face attributes specified for new frames. 5488 also merges in face attributes specified for new frames.
5485 5489
5486 Frame parameters may be changed if .Xdefaults contains 5490 Frame parameters may be changed if .Xdefaults contains