diff options
| author | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
| commit | c0466914ba3ad88c402b0301646b4b5db8aeb913 (patch) | |
| tree | 964d8df324ab5f46872dfedc92ccea9fe50a1441 /src/macgui.h | |
| parent | c97a3f22ed5841f1c8bcdbb80df2bd49635c6a56 (diff) | |
| parent | 58f8a3f97bd49484d0eb4f83a70662ded0daf9cc (diff) | |
| download | emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
Diffstat (limited to 'src/macgui.h')
| -rw-r--r-- | src/macgui.h | 12 |
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; |