From: Andrew Choi <akochoi@shaw.ca>
Date: Sun, 26 Nov 2000 06:37:13 +0000 (+0000)
Subject: * src/macterm.c (x_handle_tool_bar_click, note_tool_bar_highlight):
X-Git-Tag: emacs-pretest-21.0.92~66
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2d4bc7359904bd4c0fba639fab3496f2b6d763f9;p=emacs.git

* src/macterm.c (x_handle_tool_bar_click, note_tool_bar_highlight):
change references to members deleted from struct frame as in xterm.c.
---

diff --git a/mac/src/macterm.c b/mac/src/macterm.c
index a23cf354b21..0676e47864e 100644
--- a/mac/src/macterm.c
+++ b/mac/src/macterm.c
@@ -7204,8 +7204,7 @@ x_handle_tool_bar_click (f, button_event)
     return;
 
   /* If item is disabled, do nothing.  */
-  enabled_p = (XVECTOR (f->current_tool_bar_items)
-	       ->contents[prop_idx + TOOL_BAR_ITEM_ENABLED_P]);
+  enabled_p = AREF (f->tool_bar_items, prop_idx + TOOL_BAR_ITEM_ENABLED_P);
   if (NILP (enabled_p))
     return;
   
@@ -7225,8 +7224,7 @@ x_handle_tool_bar_click (f, button_event)
       show_mouse_face (dpyinfo, DRAW_IMAGE_RAISED);
       dpyinfo->mouse_face_image_state = DRAW_IMAGE_RAISED;
 
-      key = (XVECTOR (f->current_tool_bar_items)
-	     ->contents[prop_idx + TOOL_BAR_ITEM_KEY]);
+      key = AREF (f->tool_bar_items, prop_idx + TOOL_BAR_ITEM_KEY);
 
       XSETFRAME (frame, f);
       event.kind = TOOL_BAR_EVENT;
@@ -7299,8 +7297,7 @@ note_tool_bar_highlight (f, x, y)
   draw = mouse_down_p ? DRAW_IMAGE_SUNKEN : DRAW_IMAGE_RAISED;
   
   /* If tool-bar item is not enabled, don't highlight it.  */
-  enabled_p = (XVECTOR (f->current_tool_bar_items)
-	       ->contents[prop_idx + TOOL_BAR_ITEM_ENABLED_P]);
+  enabled_p = AREF (f->tool_bar_items, prop_idx + TOOL_BAR_ITEM_ENABLED_P);
   if (!NILP (enabled_p))
     {
       /* Compute the x-position of the glyph.  In front and past the
@@ -7334,11 +7331,9 @@ note_tool_bar_highlight (f, x, y)
      XTread_socket does the rest.  */
   help_echo_object = help_echo_window = Qnil;
   help_echo_pos = -1;
-  help_echo = (XVECTOR (f->current_tool_bar_items)
-	       ->contents[prop_idx + TOOL_BAR_ITEM_HELP]);
+  help_echo = AREF (f->tool_bar_items, prop_idx + TOOL_BAR_ITEM_HELP);
   if (NILP (help_echo))
-    help_echo = (XVECTOR (f->current_tool_bar_items)
-		 ->contents[prop_idx + TOOL_BAR_ITEM_CAPTION]);
+    help_echo = AREF (f->tool_bar_items, prop_idx + TOOL_BAR_ITEM_CAPTION);
 }