From 73b26103c8702823941b3ab6cda56befdac43857 Mon Sep 17 00:00:00 2001 From: Seiji Zenitani Date: Sun, 14 Jun 2009 06:12:34 +0000 Subject: [PATCH] Remove USE_MAC_TOOLBAR (for Mac Carbon [22.x]) --- src/ChangeLog | 4 ++++ src/xdisp.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index d1d4e600f6c..ab357bda4ce 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2009-06-14 Seiji Zenitani + + * xdisp.c [USE_MAC_TOOLBAR]: Remove obsolete definition for Mac Carbon. + 2009-06-11 Kenichi Handa * xdisp.c (x_get_glyph_overhangs): Fix calculation of right diff --git a/src/xdisp.c b/src/xdisp.c index 0f3674433b5..dd2c8714c0c 100644 --- 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) -- 2.39.2