comparison src/frame.h @ 33759:593bc303c500

(struct frame): Members desired_tool_bar_items, current_tool_bar_items, n_desired_tool_bar_items, n_current_tool_bar_items removed. Add tool_bar_items and n_tool_bar_items.
author Gerd Moellmann <gerd@gnu.org>
date Wed, 22 Nov 2000 16:28:11 +0000
parents 923b8d6d8277
children 20a470317eeb
comparison
equal deleted inserted replaced
33758:8c1e62157545 33759:593bc303c500
2 some emacs source includes both dispextern.h and frame.h */ 2 some emacs source includes both dispextern.h and frame.h */
3 #ifndef _XFRAME_H_ 3 #ifndef _XFRAME_H_
4 #define _XFRAME_H_ 4 #define _XFRAME_H_
5 5
6 /* Define frame-object for GNU Emacs. 6 /* Define frame-object for GNU Emacs.
7 Copyright (C) 1993, 1994 Free Software Foundation, Inc. 7 Copyright (C) 1993, 1994, 1999, 2000 Free Software Foundation, Inc.
8 8
9 This file is part of GNU Emacs. 9 This file is part of GNU Emacs.
10 10
11 GNU Emacs is free software; you can redistribute it and/or modify 11 GNU Emacs is free software; you can redistribute it and/or modify
12 it under the terms of the GNU General Public License as published by 12 it under the terms of the GNU General Public License as published by
177 177
178 /* A window used to display the tool-bar of a frame. */ 178 /* A window used to display the tool-bar of a frame. */
179 Lisp_Object tool_bar_window; 179 Lisp_Object tool_bar_window;
180 180
181 /* Desired and current tool-bar items. */ 181 /* Desired and current tool-bar items. */
182 Lisp_Object desired_tool_bar_items, current_tool_bar_items; 182 Lisp_Object tool_bar_items;
183 183
184 /* Desired and current contents displayed in tool_bar_window. */ 184 /* Desired and current contents displayed in tool_bar_window. */
185 Lisp_Object desired_tool_bar_string, current_tool_bar_string; 185 Lisp_Object desired_tool_bar_string, current_tool_bar_string;
186 186
187 /* beyond here, there should be no more Lisp_Object components. */ 187 /* beyond here, there should be no more Lisp_Object components. */
204 unsigned glyphs_initialized_p : 1; 204 unsigned glyphs_initialized_p : 1;
205 205
206 /* Margin at the top of the frame. Used to display the tool-bar. */ 206 /* Margin at the top of the frame. Used to display the tool-bar. */
207 int tool_bar_lines; 207 int tool_bar_lines;
208 208
209 int n_desired_tool_bar_items; 209 int n_tool_bar_items;
210 int n_current_tool_bar_items;
211 210
212 /* A buffer for decode_mode_line. */ 211 /* A buffer for decode_mode_line. */
213 char *decode_mode_spec_buffer; 212 char *decode_mode_spec_buffer;
214 213
215 /* See do_line_insertion_deletion_costs for info on these arrays. */ 214 /* See do_line_insertion_deletion_costs for info on these arrays. */