summaryrefslogtreecommitdiff
path: root/src/macgui.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/macgui.h')
-rw-r--r--src/macgui.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/macgui.h b/src/macgui.h
index 01f5317aad6..3c37b86e22a 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -1,6 +1,6 @@
/* Definitions and headers for communication on the Mac OS.
Copyright (C) 2000, 2001, 2002, 2003, 2004,
- 2005, 2006 Free Software Foundation, Inc.
+ 2005, 2006, 2007 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -24,7 +24,7 @@ Boston, MA 02110-1301, USA. */
#ifndef EMACS_MACGUI_H
#define EMACS_MACGUI_H
-typedef int Display; /* fix later */
+typedef struct _XDisplay Display; /* opaque */
typedef Lisp_Object XrmDatabase;
@@ -246,6 +246,14 @@ typedef struct _XGC
/* QuickDraw background color. */
RGBColor back_color;
+#if USE_CG_DRAWING && MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
+ /* Quartz 2D foreground color. */
+ CGColorRef cg_fore_color;
+
+ /* Quartz 2D background color. */
+ CGColorRef cg_back_color;
+#endif
+
#define MAX_CLIP_RECTS 2
/* Number of clipping rectangles. */
int n_clip_rects;