diff options
Diffstat (limited to 'src/macgui.h')
| -rw-r--r-- | src/macgui.h | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/src/macgui.h b/src/macgui.h index d9948278d1b..607890317e1 100644 --- a/src/macgui.h +++ b/src/macgui.h @@ -1,5 +1,6 @@ /* Definitions and headers for communication on the Mac OS. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -86,6 +87,10 @@ typedef GWorldPtr Pixmap; #define FACE_DEFAULT (~0) +#if !TARGET_API_MAC_CARBON +#define GetPixDepth(pmh) ((*(pmh))->pixelSize) +#endif + /* Emulate XCharStruct. */ typedef struct _XCharStruct @@ -180,15 +185,24 @@ typedef struct _XGCValues XFontStruct *font; } XGCValues; -typedef XGCValues *GC; +typedef struct _XGC +{ + /* Original value. */ + XGCValues xgcv; + + /* Cached data members follow. */ + + /* QuickDraw foreground color. */ + RGBColor fore_color; -extern XGCValues * -XCreateGC (void *, Window, unsigned long, XGCValues *); + /* QuickDraw background color. */ + RGBColor back_color; +} *GC; -#define GCForeground 0x01 -#define GCBackground 0x02 -#define GCFont 0x03 -#define GCGraphicsExposures 0 +#define GCForeground (1L<<2) +#define GCBackground (1L<<3) +#define GCFont (1L<<14) +#define GCGraphicsExposures 0 /* Bit Gravity */ @@ -248,8 +262,6 @@ typedef struct { #define PBaseSize (1L << 8) /* program specified base for incrementing */ #define PWinGravity (1L << 9) /* program specified window gravity */ -extern int XParseGeometry (); - typedef struct { int x, y; unsigned width, height; |