summaryrefslogtreecommitdiff
path: root/src/frame.h
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2000-11-22 16:28:11 +0000
committerGerd Moellmann <gerd@gnu.org>2000-11-22 16:28:11 +0000
commite3303a238324391d5be74bc3d9fba1c20b3a7848 (patch)
tree3f8c2baa9f67f99f56ca04c02d92f15e5cc3a108 /src/frame.h
parent6db746da2610c269978491601fb1ddb579265e1b (diff)
downloademacs-e3303a238324391d5be74bc3d9fba1c20b3a7848.tar.gz
(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.
Diffstat (limited to 'src/frame.h')
-rw-r--r--src/frame.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/frame.h b/src/frame.h
index a8c759fe407..5db5ebd3019 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -4,7 +4,7 @@
#define _XFRAME_H_
/* Define frame-object for GNU Emacs.
- Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1994, 1999, 2000 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -179,7 +179,7 @@ struct frame
Lisp_Object tool_bar_window;
/* Desired and current tool-bar items. */
- Lisp_Object desired_tool_bar_items, current_tool_bar_items;
+ Lisp_Object tool_bar_items;
/* Desired and current contents displayed in tool_bar_window. */
Lisp_Object desired_tool_bar_string, current_tool_bar_string;
@@ -206,8 +206,7 @@ struct frame
/* Margin at the top of the frame. Used to display the tool-bar. */
int tool_bar_lines;
- int n_desired_tool_bar_items;
- int n_current_tool_bar_items;
+ int n_tool_bar_items;
/* A buffer for decode_mode_line. */
char *decode_mode_spec_buffer;