diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2005-07-18 05:41:03 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2005-07-18 05:41:03 +0000 |
| commit | e81a5b61b18fefb01b134ca12640c15502700e6d (patch) | |
| tree | c511163a54390db8e4590e6f4f8bebd861c95baa /src | |
| parent | e4f5e01926ad4b189f60f6b793dd1d90164b582e (diff) | |
| download | emacs-e81a5b61b18fefb01b134ca12640c15502700e6d.tar.gz | |
(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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/macterm.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/macterm.h b/src/macterm.h index f0846b10fa4..71cd4db82c0 100644 --- a/src/macterm.h +++ b/src/macterm.h @@ -149,7 +149,7 @@ struct mac_display_info 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 @@ struct mac_output { /* Relief GCs, colors etc. */ struct relief { - XGCValues *gc; + GC gc; unsigned long pixel; int allocated_p; } @@ -601,6 +601,8 @@ EXFUN (Fx_display_color_p, 1); 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 @@ extern Pixmap XCreatePixmapFromBitmapData P_ ((Display *, WindowPtr, char *, 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)); |