Mercurial > emacs
diff src/macterm.c @ 83248:86457de2420c
Merged from miles@gnu.org--gnu-2005 (patch 76-78)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-76
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-77
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-78
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-288
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Fri, 04 Feb 2005 15:36:07 +0000 |
| parents | 3dcba0bc766b 96a18b943293 |
| children | 1f334cdd7020 |
line wrap: on
line diff
--- a/src/macterm.c Fri Feb 04 14:06:45 2005 +0000 +++ b/src/macterm.c Fri Feb 04 15:36:07 2005 +0000 @@ -729,7 +729,7 @@ 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 @@ 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 @@ 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