Mercurial > hg > xemacs-beta
comparison src/frame-msw.c @ 406:b8cc9ab3f761 r21-2-33
Import from CVS: tag r21-2-33
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:17:09 +0200 |
parents | 2f8bb876ab1d |
children | 501cfd01ee6d |
comparison
equal
deleted
inserted
replaced
405:0e08f63c74d2 | 406:b8cc9ab3f761 |
---|---|
138 #ifdef HAVE_TOOLBARS | 138 #ifdef HAVE_TOOLBARS |
139 FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE(f) = | 139 FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE(f) = |
140 make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, HASH_TABLE_EQUAL); | 140 make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, HASH_TABLE_EQUAL); |
141 #endif | 141 #endif |
142 /* hashtable of instantiated glyphs on the frame. */ | 142 /* hashtable of instantiated glyphs on the frame. */ |
143 FRAME_MSWINDOWS_WIDGET_HASH_TABLE (f) = | 143 FRAME_MSWINDOWS_WIDGET_HASH_TABLE1 (f) = |
144 make_lisp_hash_table (50, HASH_TABLE_VALUE_WEAK, HASH_TABLE_EQUAL); | |
145 FRAME_MSWINDOWS_WIDGET_HASH_TABLE2 (f) = | |
146 make_lisp_hash_table (50, HASH_TABLE_VALUE_WEAK, HASH_TABLE_EQUAL); | |
147 FRAME_MSWINDOWS_WIDGET_HASH_TABLE3 (f) = | |
144 make_lisp_hash_table (50, HASH_TABLE_VALUE_WEAK, HASH_TABLE_EQUAL); | 148 make_lisp_hash_table (50, HASH_TABLE_VALUE_WEAK, HASH_TABLE_EQUAL); |
145 /* Will initialize these in WM_SIZE handler. We cannot do it now, | 149 /* Will initialize these in WM_SIZE handler. We cannot do it now, |
146 because we do not know what is CW_USEDEFAULT height and width */ | 150 because we do not know what is CW_USEDEFAULT height and width */ |
147 FRAME_WIDTH (f) = 0; | 151 FRAME_WIDTH (f) = 0; |
148 FRAME_HEIGHT (f) = 0; | 152 FRAME_HEIGHT (f) = 0; |
257 { | 261 { |
258 mark_object (FRAME_MSWINDOWS_MENU_HASH_TABLE (f)); | 262 mark_object (FRAME_MSWINDOWS_MENU_HASH_TABLE (f)); |
259 #ifdef HAVE_TOOLBARS | 263 #ifdef HAVE_TOOLBARS |
260 mark_object (FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f)); | 264 mark_object (FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f)); |
261 #endif | 265 #endif |
262 mark_object (FRAME_MSWINDOWS_WIDGET_HASH_TABLE (f)); | 266 mark_object (FRAME_MSWINDOWS_WIDGET_HASH_TABLE1 (f)); |
267 mark_object (FRAME_MSWINDOWS_WIDGET_HASH_TABLE2 (f)); | |
268 mark_object (FRAME_MSWINDOWS_WIDGET_HASH_TABLE3 (f)); | |
263 } | 269 } |
264 | 270 |
265 static void | 271 static void |
266 mswindows_focus_on_frame (struct frame *f) | 272 mswindows_focus_on_frame (struct frame *f) |
267 { | 273 { |