summaryrefslogtreecommitdiff
path: root/src/w32fns.c
diff options
context:
space:
mode:
authorAlexander Gramiak <agrambot@gmail.com>2019-05-09 22:08:06 -0600
committerAlexander Gramiak <agrambot@gmail.com>2019-05-19 19:50:32 -0600
commitb3d3c0daa49f5cbed7c58c7508d4d36dba3757e5 (patch)
tree72360d5d9cdd8bc9f6ad715128d5452889d0caa3 /src/w32fns.c
parent462b1fd7185ab8866c8db15b6e7a9b865e4d2389 (diff)
downloademacs-b3d3c0daa49f5cbed7c58c7508d4d36dba3757e5.tar.gz
emacs-b3d3c0daa49f5cbed7c58c7508d4d36dba3757e5.tar.bz2
emacs-b3d3c0daa49f5cbed7c58c7508d4d36dba3757e5.zip
Introduce Emacs_GC struct and typedef
* src/dispextern.h [HAVE_X_WINDOWS]: Alias Emacs_GC to XGCValues. [!HAVE_X_WINDOWS]: Define Emacs_GC, GCForeground, and GCBackground. * src/nsgui.h: * src/w32gui.h:Remove obsolete XGCValues, GC, GCForeground, GCBackground, and GCFont definitions. * src/w32fns.c (w32_make_gc): Do not set unused font field. * src/w32term.c: Use Emacs_GC over XGCValues. Do not set unused font field. * src/xfaces.c: Use Emacs_GC over XGCValues and GC.
Diffstat (limited to 'src/w32fns.c')
-rw-r--r--src/w32fns.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/w32fns.c b/src/w32fns.c
index d74e968d379..bb74fcc1640 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5559,22 +5559,19 @@ w32_icon (struct frame *f, Lisp_Object parms)
static void
w32_make_gc (struct frame *f)
{
- XGCValues gc_values;
+ Emacs_GC gc_values;
block_input ();
/* Create the GC's of this frame.
Note that many default values are used. */
- /* Normal video */
- gc_values.font = FRAME_FONT (f);
-
/* Cursor has cursor-color background, background-color foreground. */
gc_values.foreground = FRAME_BACKGROUND_PIXEL (f);
gc_values.background = f->output_data.w32->cursor_pixel;
f->output_data.w32->cursor_gc
= XCreateGC (NULL, FRAME_W32_WINDOW (f),
- (GCFont | GCForeground | GCBackground),
+ (GCForeground | GCBackground),
&gc_values);
/* Reliefs. */