[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/macgui.h,v [EMACS_22_BASE]
From: |
YAMAMOTO Mitsuharu |
Subject: |
[Emacs-diffs] Changes to emacs/src/macgui.h,v [EMACS_22_BASE] |
Date: |
Sat, 29 Mar 2008 00:46:11 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: YAMAMOTO Mitsuharu <mituharu> 08/03/29 00:46:11
Index: macgui.h
===================================================================
RCS file: /sources/emacs/emacs/src/macgui.h,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -u -b -r1.37.2.2 -r1.37.2.3
--- macgui.h 8 Jan 2008 04:29:58 -0000 1.37.2.2
+++ macgui.h 29 Mar 2008 00:46:11 -0000 1.37.2.3
@@ -71,7 +71,7 @@
#undef Z
#define Z (current_buffer->text->z)
#else /* not HAVE_CARBON */
-#include <QuickDraw.h> /* for WindowPtr */
+#include <QuickDraw.h> /* for WindowRef */
#include <QDOffscreen.h> /* for GWorldPtr */
#include <Appearance.h> /* for ThemeCursor */
#include <Windows.h>
@@ -98,7 +98,7 @@
/* Whether to use Quartz 2D routines for drawing operations other than
texts. */
#ifndef USE_CG_DRAWING
-#if USE_ATSUI && MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
#define USE_CG_DRAWING 1
#endif
#endif
@@ -117,7 +117,14 @@
#endif
#endif
-typedef WindowPtr Window;
+/* Whether to use HIToolbar. */
+#ifndef USE_MAC_TOOLBAR
+#if USE_CG_DRAWING && MAC_OS_X_VERSION_MAX_ALLOWED >= 1030 &&
MAC_OS_X_VERSION_MIN_REQUIRED != 1020
+#define USE_MAC_TOOLBAR 1
+#endif
+#endif
+
+typedef WindowRef Window;
typedef GWorldPtr Pixmap;
#define Cursor ThemeCursor
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/macgui.h,v [EMACS_22_BASE],
YAMAMOTO Mitsuharu <=