# HG changeset patch
# User Seiji Zenitani <zenitani@mac.com>
# Date 1244959954 0
# Node ID 3b5cf06e7df9aaa90e3bb603276025c8ac07ca1f
# Parent  00d812968c6c32e3d016ca57fe7e4fba04abf73c
Remove USE_MAC_TOOLBAR (for Mac Carbon [22.x])

diff -r 00d812968c6c -r 3b5cf06e7df9 src/ChangeLog
--- a/src/ChangeLog	Sat Jun 13 21:18:51 2009 +0000
+++ b/src/ChangeLog	Sun Jun 14 06:12:34 2009 +0000
@@ -1,3 +1,7 @@
+2009-06-14  Seiji Zenitani  <zenitani@mac.com>
+
+	* xdisp.c [USE_MAC_TOOLBAR]: Remove obsolete definition for Mac Carbon.
+
 2009-06-11  Kenichi Handa  <handa@m17n.org>
 
 	* xdisp.c (x_get_glyph_overhangs): Fix calculation of right
diff -r 00d812968c6c -r 3b5cf06e7df9 src/xdisp.c
--- a/src/xdisp.c	Sat Jun 13 21:18:51 2009 +0000
+++ b/src/xdisp.c	Sun Jun 14 06:12:34 2009 +0000
@@ -9863,7 +9863,7 @@
      struct frame *f;
      int save_match_data;
 {
-#if defined (USE_GTK) || defined (HAVE_NS) || USE_MAC_TOOLBAR
+#if defined (USE_GTK) || defined (HAVE_NS)
   int do_update = FRAME_EXTERNAL_TOOL_BAR (f);
 #else
   int do_update = WINDOWP (f->tool_bar_window)
@@ -10337,7 +10337,7 @@
   struct it it;
   struct glyph_row *row;
 
-#if defined (USE_GTK) || defined (HAVE_NS) || USE_MAC_TOOLBAR
+#if defined (USE_GTK) || defined (HAVE_NS)
   if (FRAME_EXTERNAL_TOOL_BAR (f))
     update_frame_tool_bar (f);
   return 0;
@@ -13968,7 +13968,7 @@
 #ifdef HAVE_WINDOW_SYSTEM
       if (FRAME_WINDOW_P (f))
         {
-#if defined (USE_GTK) || defined (HAVE_NS) || USE_MAC_TOOLBAR
+#if defined (USE_GTK) || defined (HAVE_NS)
           redisplay_tool_bar_p = FRAME_EXTERNAL_TOOL_BAR (f);
 #else
           redisplay_tool_bar_p = WINDOWP (f->tool_bar_window)