comparison src/console-x.h @ 217:d44af0c54775 r20-4b7

Import from CVS: tag r20-4b7
author cvs
date Mon, 13 Aug 2007 10:08:34 +0200
parents b405438285a2
children 262b8bb4a523
comparison
equal deleted inserted replaced
216:43306a74e31c 217:d44af0c54775
255 /* Lists the widgets above the text area, in the proper order. 255 /* Lists the widgets above the text area, in the proper order.
256 Used by the EmacsManager. */ 256 Used by the EmacsManager. */
257 Widget top_widgets[MAX_CONCURRENT_TOP_WIDGETS]; 257 Widget top_widgets[MAX_CONCURRENT_TOP_WIDGETS];
258 int num_top_widgets; 258 int num_top_widgets;
259 259
260 #ifdef ENERGIZE
261 /* The Energize property-sheets. The current_* slots are the ones
262 which are actually on the frame. The desired_ slots are the ones
263 which should be there. Redisplay synchs these. */
264 int *current_psheets;
265 int *desired_psheets;
266 int current_psheet_count;
267 int desired_psheet_count;
268 Lisp_Object current_psheet_buffer;
269 Lisp_Object desired_psheet_buffer;
270 #endif /* ENERGIZE */
271
272 /*************************** Miscellaneous **************************/ 260 /*************************** Miscellaneous **************************/
273 261
274 /* The icon pixmaps; these are Lisp_Image_Instance objects, or Qnil. */ 262 /* The icon pixmaps; these are Lisp_Image_Instance objects, or Qnil. */
275 Lisp_Object icon_pixmap; 263 Lisp_Object icon_pixmap;
276 Lisp_Object icon_pixmap_mask; 264 Lisp_Object icon_pixmap_mask;
326 #define FRAME_X_CONTAINER_WIDGET(f) (FRAME_X_DATA (f)->container) 314 #define FRAME_X_CONTAINER_WIDGET(f) (FRAME_X_DATA (f)->container)
327 #define FRAME_X_MENUBAR_WIDGET(f) (FRAME_X_DATA (f)->menubar_widget) 315 #define FRAME_X_MENUBAR_WIDGET(f) (FRAME_X_DATA (f)->menubar_widget)
328 #define FRAME_X_TEXT_WIDGET(f) (FRAME_X_DATA (f)->edit_widget) 316 #define FRAME_X_TEXT_WIDGET(f) (FRAME_X_DATA (f)->edit_widget)
329 #define FRAME_X_TOP_WIDGETS(f) (FRAME_X_DATA (f)->top_widgets) 317 #define FRAME_X_TOP_WIDGETS(f) (FRAME_X_DATA (f)->top_widgets)
330 #define FRAME_X_NUM_TOP_WIDGETS(f) (FRAME_X_DATA (f)->num_top_widgets) 318 #define FRAME_X_NUM_TOP_WIDGETS(f) (FRAME_X_DATA (f)->num_top_widgets)
331
332 #ifdef ENERGIZE
333 #define FRAME_X_CURRENT_PSHEETS(f) (FRAME_X_DATA (f)->current_psheets)
334 #define FRAME_X_DESIRED_PSHEETS(f) (FRAME_X_DATA (f)->desired_psheets)
335 #define FRAME_X_CURRENT_PSHEET_COUNT(f) (FRAME_X_DATA (f)->current_psheet_count)
336 #define FRAME_X_DESIRED_PSHEET_COUNT(f) (FRAME_X_DATA (f)->desired_psheet_count)
337 #define FRAME_X_CURRENT_PSHEET_BUFFER(f) (FRAME_X_DATA (f)->current_psheet_buffer)
338 #define FRAME_X_DESIRED_PSHEET_BUFFER(f) (FRAME_X_DATA (f)->desired_psheet_buffer)
339 #endif /* ENERGIZE */
340 319
341 #define FRAME_X_ICON_PIXMAP(f) (FRAME_X_DATA (f)->icon_pixmap) 320 #define FRAME_X_ICON_PIXMAP(f) (FRAME_X_DATA (f)->icon_pixmap)
342 #define FRAME_X_ICON_PIXMAP_MASK(f) (FRAME_X_DATA (f)->icon_pixmap_mask) 321 #define FRAME_X_ICON_PIXMAP_MASK(f) (FRAME_X_DATA (f)->icon_pixmap_mask)
343 322
344 #ifdef HAVE_TOOLBARS 323 #ifdef HAVE_TOOLBARS