(struct _XGC): New struct.

(GC): Use it.
(GCForeground, GCBackground, GCFont): Use X11 mask values.
(XCreateGC, XParseGeometry): Move externs to macterm.h.

1 files changed, 16 insertions, 9 deletions

diff --git a/src/macgui.h b/src/macgui.h
index d9948278d1b..ca55bad7a8c 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -180,15 +180,24 @@ typedef struct _XGCValues
   XFontStruct *font;
 } XGCValues;
 
-typedef XGCValues *GC;
+typedef struct _XGC
+{
+  /* Original value.  */
+  XGCValues xgcv;
+
+  /* Cached data members follow.  */
 
-extern XGCValues *
-XCreateGC (void *, Window, unsigned long, XGCValues *);
+  /* QuickDraw foreground color.  */
+  RGBColor fore_color;
 
-#define GCForeground 0x01
-#define GCBackground 0x02
-#define GCFont 0x03
-#define GCGraphicsExposures 0
+  /* QuickDraw background color.  */
+  RGBColor back_color;
+} *GC;
+
+#define GCForeground            (1L<<2)
+#define GCBackground            (1L<<3)
+#define GCFont 			(1L<<14)
+#define GCGraphicsExposures	0
 
 /* Bit Gravity */
 
@@ -248,8 +257,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;