Mercurial > hg > xemacs-beta
comparison src/console-xlike-inc.h @ 5178:97eb4942aec8
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 29 Mar 2010 21:28:13 -0500 |
parents | 8b2f75cecb89 5502045ec510 |
children | 308d34e9f07d |
comparison
equal
deleted
inserted
replaced
5177:b785049378e3 | 5178:97eb4942aec8 |
---|---|
167 #define XLIKE_GC_FOREGROUND GCForeground | 167 #define XLIKE_GC_FOREGROUND GCForeground |
168 #define XLIKE_GC_FUNCTION GCFunction | 168 #define XLIKE_GC_FUNCTION GCFunction |
169 #define XLIKE_GC_LINE_WIDTH GCLineWidth | 169 #define XLIKE_GC_LINE_WIDTH GCLineWidth |
170 #define XLIKE_GC_STIPPLE GCStipple | 170 #define XLIKE_GC_STIPPLE GCStipple |
171 #define XLIKE_GC_TILE GCTile | 171 #define XLIKE_GC_TILE GCTile |
172 #define XLIKE_GC_TS_X_ORIGIN GCTileStipXOrigin | |
173 #define XLIKE_GC_TS_Y_ORIGIN GCTileStipYOrigin | |
172 | 174 |
173 #define XLIKE_GX_COPY GXcopy | 175 #define XLIKE_GX_COPY GXcopy |
174 #define XLIKE_GX_XOR GXxor | 176 #define XLIKE_GX_XOR GXxor |
175 | 177 |
176 #define XLIKE_FILL_STIPPLED FillStippled | 178 #define XLIKE_FILL_STIPPLED FillStippled |
256 #define XLIKE_GC_FOREGROUND GDK_GC_FOREGROUND | 258 #define XLIKE_GC_FOREGROUND GDK_GC_FOREGROUND |
257 #define XLIKE_GC_FUNCTION GDK_GC_FUNCTION | 259 #define XLIKE_GC_FUNCTION GDK_GC_FUNCTION |
258 #define XLIKE_GC_LINE_WIDTH GDK_GC_LINE_WIDTH | 260 #define XLIKE_GC_LINE_WIDTH GDK_GC_LINE_WIDTH |
259 #define XLIKE_GC_STIPPLE GDK_GC_STIPPLE | 261 #define XLIKE_GC_STIPPLE GDK_GC_STIPPLE |
260 #define XLIKE_GC_TILE GDK_GC_TILE | 262 #define XLIKE_GC_TILE GDK_GC_TILE |
263 #define XLIKE_GC_TS_X_ORIGIN GDK_GC_TS_X_ORIGIN | |
264 #define XLIKE_GC_TS_Y_ORIGIN GDK_GC_TS_Y_ORIGIN | |
261 | 265 |
262 #define XLIKE_GX_COPY GDK_COPY | 266 #define XLIKE_GX_COPY GDK_COPY |
263 #define XLIKE_GX_XOR GDK_XOR | 267 #define XLIKE_GX_XOR GDK_XOR |
264 | 268 |
265 #define XLIKE_FILL_STIPPLED GDK_STIPPLED | 269 #define XLIKE_FILL_STIPPLED GDK_STIPPLED |