diff options
| author | Alexander Gramiak | 2019-05-09 22:08:06 -0600 |
|---|---|---|
| committer | Alexander Gramiak | 2019-05-19 19:50:32 -0600 |
| commit | b3d3c0daa49f5cbed7c58c7508d4d36dba3757e5 (patch) | |
| tree | 72360d5d9cdd8bc9f6ad715128d5452889d0caa3 /src/nsgui.h | |
| parent | 462b1fd7185ab8866c8db15b6e7a9b865e4d2389 (diff) | |
| download | emacs-b3d3c0daa49f5cbed7c58c7508d4d36dba3757e5.tar.gz 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/nsgui.h')
| -rw-r--r-- | src/nsgui.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/nsgui.h b/src/nsgui.h index 592e21f60af..87c06e68a22 100644 --- a/src/nsgui.h +++ b/src/nsgui.h | |||
| @@ -76,25 +76,6 @@ typedef unichar XChar2b; | |||
| 76 | /* Used in xdisp.c when comparing faces and frame colors. */ | 76 | /* Used in xdisp.c when comparing faces and frame colors. */ |
| 77 | extern unsigned long ns_color_index_to_rgba(int idx, struct frame *f); | 77 | extern unsigned long ns_color_index_to_rgba(int idx, struct frame *f); |
| 78 | 78 | ||
| 79 | /* XXX: xfaces requires these structures, but the question is are we | ||
| 80 | forced to use them? */ | ||
| 81 | typedef struct _XGCValues | ||
| 82 | { | ||
| 83 | unsigned long foreground; | ||
| 84 | unsigned long background; | ||
| 85 | #ifdef __OBJC__ | ||
| 86 | struct ns_font *font; | ||
| 87 | #else | ||
| 88 | void *font; | ||
| 89 | #endif | ||
| 90 | } XGCValues; | ||
| 91 | |||
| 92 | typedef XGCValues * GC; | ||
| 93 | |||
| 94 | #define GCForeground 0x01 | ||
| 95 | #define GCBackground 0x02 | ||
| 96 | #define GCFont 0x03 | ||
| 97 | |||
| 98 | #ifdef __OBJC__ | 79 | #ifdef __OBJC__ |
| 99 | typedef id Emacs_Pixmap; | 80 | typedef id Emacs_Pixmap; |
| 100 | #else | 81 | #else |