(FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL): Moved

to frame.h.

diff --git a/src/ChangeLog b/src/ChangeLog
index f0eabbaf380ec0f183c39ea6c591b2fd4bb5feb7..a54f77e1633a65b529e9614e67991d4d32a13b53 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+1999-12-10  Gerd Moellmann  <gerd@gnu.org>
+
+       * frame.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL)
+       [!MSDOS && !WINDOWSNT && !macintosh]: Moved here from xterm.h.
+
+       * xterm.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL): Moved
+       to frame.h.
+
 1999-12-09  Stefan Monnier  <monnier@cs.yale.edu>
 
        * keyboard.c (Qratio): New symbol.

diff --git a/src/xterm.h b/src/xterm.h
index 6b11c71f25d34ac274251b1c2e92440c351244ca..734bdb180b7deede4361770a60279b2d30acf547 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -577,8 +577,6 @@ struct x_output
 #define FRAME_OUTER_WINDOW(f) (FRAME_X_WINDOW (f))
 #endif
 
-#define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel)
-#define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel)
 #define FRAME_FONT(f) ((f)->output_data.x->font)
 #define FRAME_FONTSET(f) ((f)->output_data.x->fontset)
 #define FRAME_INTERNAL_BORDER_WIDTH(f) ((f)->output_data.x->internal_border_width)