[MAC_OS] (XCreateGC): Remove extern.

diff --git a/src/ChangeLog b/src/ChangeLog
index ed504ef7cc7d3ad8395c7370edbea62ef21afac7..ee3c67b08cd41d0c3acd6b6b09477d0652066d99 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,38 @@
+2005-07-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * macfns.c (x_set_cursor_color): Use XSetBackground and
+       XSetForeground.
+
+       * macgui.h (struct _XGC): New struct.
+       (GC): Use it.
+       (GCForeground, GCBackground, GCFont): Use X11 mask values.
+       (XCreateGC, XParseGeometry): Move externs to macterm.h.
+
+       * macterm.c (x_bitmap_icon, x_make_frame_visible): Remove
+       declarations.
+       (XSetFont): Add declaration.
+       (mac_set_forecolor, mac_set_backcolor, mac_set_colors): Remove
+       functions.
+       (GC_FORE_COLOR, GC_BACK_COLOR, GC_FONT, MAC_WINDOW_NORMAL_GC): New
+       defines.
+       (XDrawLine, mac_draw_line_to_pixmap, XClearWindow)
+       (mac_draw_bitmap, XCreatePixmapFromBitmapData, XFillRectangle)
+       (mac_draw_rectangle, mac_draw_string_common, mac_scroll_area): Use
+       them.
+       (mac_erase_rectangle): New function.
+       (XClearArea, x_draw_fringe_bitmap, x_clear_glyph_string_rect)
+       (x_draw_stretch_glyph_string): Use it.
+       (XChangeGC, XCreateGC, XGetGCValues, XSetForeground)
+       (XSetBackground, XSetFont): Adjust for new GC implementation.
+       (x_draw_fringe_bitmap, x_draw_box_rect): Use GC to set colors.
+       (XTset_vertical_scroll_bar): Clear area under scroll bar.
+
+       * macterm.h (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.
+
+       * xfaces.c [MAC_OS] (XCreateGC): Remove extern.
+
 2005-07-16  Richard M. Stallman  <rms@gnu.org>
 
        * buffer.c (Fmake_overlay): Doc fix.

diff --git a/src/xfaces.c b/src/xfaces.c
index af9571a102f47e929172fb60962c989a3f98b08d..02513107c67208c900641eb4ac44adf89039eee3 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -783,8 +783,6 @@ x_free_gc (f, gc)
 #ifdef MAC_OS
 /* Mac OS emulation of GCs */
 
-extern XGCValues *XCreateGC (void *, Window, unsigned long, XGCValues *);
-
 static INLINE GC
 x_create_gc (f, mask, xgcv)
      struct frame *f;