(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.

diff --git a/src/frame.h b/src/frame.h
index a8c759fe40794c3041c2f9a75419da2fa54b901d..5db5ebd301993cce72a1214ffbe0f08ac8065f0c 100644 (file)
--- 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;