Remove USE_MAC_TOOLBAR (for Mac Carbon [22.x])

73b26103 · Seiji Zenitani · 4f9d4de3 · 73b26103 · 73b26103
Commit 73b26103 authored Jun 14, 2009 by Seiji Zenitani
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

src/ChangeLog src/ChangeLog +4 -0

src/xdisp.c src/xdisp.c +3 -3

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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

--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9863,7 +9863,7 @@ update_tool_bar (f, save_match_data)
     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 @@ redisplay_tool_bar (f)
  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 @@ redisplay_window (window, just_this_one_p)
 #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)