From e9859e269b8a6e8279b7bfc00193789198823711 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Thu, 3 Feb 2005 11:58:25 +0000 Subject: [PATCH] (mac_draw_string_common, x_make_frame_visible): Use MAC_OS_X_VERSION_MAX_ALLOWED to conditionalize by the compiling OS version. --- src/ChangeLog | 10 ++++++++++ src/macterm.c | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6dd4211364f..978614515e1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2005-02-03 YAMAMOTO Mitsuharu + + * mac.c: Use MAC_OS_X_VERSION_MAX_ALLOWED to conditionalize by + the compiling OS version. + + * macfns.c (x_create_tip_frame): Likewise. + + * macterm.c (mac_draw_string_common, x_make_frame_visible): + Likewise. + 2005-02-03 Richard M. Stallman * xterm.c (x_error_quitter): On GCC 3 and up, specify noinline. diff --git a/src/macterm.c b/src/macterm.c index 9dfe67bd040..3e8bbd5033c 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -729,7 +729,7 @@ mac_draw_string_common (display, w, gc, x, y, buf, nchars, mode, int nchars, mode, bytes_per_char; { SetPortWindowPort (w); -#ifdef MAC_OS_X_VERSION_10_2 +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020 UInt32 textFlags, savedFlags; if (!NILP(Vmac_use_core_graphics)) { textFlags = kQDUseCGTextRendering; @@ -746,7 +746,7 @@ mac_draw_string_common (display, w, gc, x, y, buf, nchars, mode, MoveTo (x, y); DrawText (buf, 0, nchars * bytes_per_char); -#ifdef MAC_OS_X_VERSION_10_2 +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020 if (!NILP(Vmac_use_core_graphics)) SwapQDTextFlags(savedFlags); #endif @@ -5451,7 +5451,7 @@ x_make_frame_visible (f) else RepositionWindow (FRAME_MAC_WINDOW (f), FRAME_MAC_WINDOW (sf), -#ifdef MAC_OS_X_VERSION_10_2 +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020 kWindowCascadeStartAtParentWindowScreen #else kWindowCascadeOnParentWindowScreen -- 2.39.5