# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1121665263 0
# Node ID fd8d1b7269d60424a0ef586047e2823aadd7c49f
# Parent  feba2f2d875ed064adf608d117d18a4fc131cce9
(struct mac_display_info): Change types of scratch_cursor_gc
black_relief.gc, and white_relief.gc to GC.
(XCreateGC, XParseGeometry): Move externs from macgui.h.

diff -r feba2f2d875e -r fd8d1b7269d6 src/macterm.h
--- a/src/macterm.h	Mon Jul 18 05:40:30 2005 +0000
+++ b/src/macterm.h	Mon Jul 18 05:41:03 2005 +0000
@@ -149,7 +149,7 @@
   int smallest_font_height;
 
   /* Reusable Graphics Context for drawing a cursor in a non-default face. */
-  XGCValues *scratch_cursor_gc;
+  GC scratch_cursor_gc;
 
   /* These variables describe the range of text currently shown in its
      mouse-face, together with the window they apply to. As long as
@@ -388,7 +388,7 @@
   /* Relief GCs, colors etc.  */
   struct relief
   {
-    XGCValues *gc;
+    GC gc;
     unsigned long pixel;
     int allocated_p;
   }
@@ -601,6 +601,8 @@
 EXFUN (Fx_display_grayscale_p, 1);
 EXFUN (Fx_display_planes, 1);
 extern void x_free_gcs P_ ((struct frame *));
+extern int XParseGeometry P_ ((char *, int *, int *, unsigned int *,
+			       unsigned int *));
 
 /* Defined in macterm.c.  */
 
@@ -614,6 +616,7 @@
 					       unsigned long, unsigned long,
 					       unsigned int));
 extern void XFreePixmap P_ ((Display *, Pixmap));
+extern GC XCreateGC P_ ((Display *, Window, unsigned long, XGCValues *));
 extern void XSetForeground P_ ((Display *, GC, unsigned long));
 extern void XSetBackground P_ ((Display *, GC, unsigned long));
 extern void XSetWindowBackground P_ ((Display *, WindowPtr, unsigned long));