Migrate to Emacs_GC

* ../src/xfaces.c (x_create_gc, x_free_gc):

* ../src/pgtkterm.h (struct pgtk_output, struct pgtk_output):

* ../src/pgtkterm.c (x_set_cursor_gc, x_set_mouse_face_gc)
(x_setup_relief_color, x_draw_image_foreground_1)
(x_draw_image_foreground)
(pgtk_cr_draw_image, pgtk_draw_fringe_bitmap)
(pgtk_begin_cr_clip, pgtk_set_cr_source_with_gc_foreground)
(pgtk_set_cr_source_with_gc_background):

* ../src/pgtkgui.h:

* ../src/dispextern.h (struct glyph_string): clean up XGCValues  emulation

XGCValues, GC 廃止。

Emacs_GC に統一。

1 files changed, 7 insertions, 7 deletions

diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index ed8d7e841be..9fbf41c6fbc 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -754,7 +754,7 @@ x_set_cursor_gc (struct glyph_string *s)
   else
     {
       /* Cursor on non-default face: must merge.  */
-      XGCValues xgcv;
+      Emacs_GC xgcv;
 
       PGTK_TRACE("x_set_cursor_gc: 2.");
       xgcv.background = FRAME_X_OUTPUT(s->f)->cursor_color;
@@ -815,7 +815,7 @@ x_set_mouse_face_gc (struct glyph_string *s)
     {
       /* Otherwise construct scratch_cursor_gc with values from FACE
          except for FONT.  */
-      XGCValues xgcv;
+      Emacs_GC xgcv;
 
       xgcv.background = s->face->background;
       xgcv.foreground = s->face->foreground;
@@ -1433,7 +1433,7 @@ static void
 x_setup_relief_color (struct frame *f, struct relief *relief, double factor,
                       int delta, unsigned long default_pixel)
 {
-  XGCValues xgcv;
+  Emacs_GC xgcv;
   struct pgtk_output *di = FRAME_X_OUTPUT(f);
   unsigned long pixel;
   unsigned long background = di->relief_background;
@@ -3107,7 +3107,7 @@ pgtk_clip_to_row (struct window *w, struct glyph_row *row,
 }
 
 static void
-pgtk_cr_draw_image (struct frame *f, GC gc, cairo_pattern_t *image,
+pgtk_cr_draw_image (struct frame *f, Emacs_GC *gc, cairo_pattern_t *image,
                  int src_x, int src_y, int width, int height,
                  int dest_x, int dest_y, bool overlay_p)
 {
@@ -3198,7 +3198,7 @@ pgtk_draw_fringe_bitmap (struct window *w, struct glyph_row *row, struct draw_fr
   PGTK_TRACE("which: %d, max_fringe_bmp: %d.", p->which, max_fringe_bmp);
   if (p->which && p->which < max_fringe_bmp)
     {
-      XGCValues gcv;
+      Emacs_GC gcv;
 
       PGTK_TRACE("cursor_p=%d.", p->cursor_p);
       PGTK_TRACE("overlay_p_p=%d.", p->overlay_p);
@@ -6356,14 +6356,14 @@ pgtk_end_cr_clip (struct frame *f)
 }
 
 void
-pgtk_set_cr_source_with_gc_foreground (struct frame *f, XGCValues *gc)
+pgtk_set_cr_source_with_gc_foreground (struct frame *f, Emacs_GC *gc)
 {
   PGTK_TRACE("pgtk_set_cr_source_with_gc_foreground: %08lx", gc->foreground);
   pgtk_set_cr_source_with_color(f, gc->foreground);
 }
 
 void
-pgtk_set_cr_source_with_gc_background (struct frame *f, XGCValues *gc)
+pgtk_set_cr_source_with_gc_background (struct frame *f, Emacs_GC *gc)
 {
   PGTK_TRACE("pgtk_set_cr_source_with_gc_background: %08lx", gc->background);
   pgtk_set_cr_source_with_color(f, gc->background);