summaryrefslogtreecommitdiffstats
path: root/generic/tkIntXlibDecls.h
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-02-10 08:52:32 (GMT)
committerhobbs <hobbs>2000-02-10 08:52:32 (GMT)
commit6e3c3db8630f629578ea034020ae7d920aadf4ce (patch)
tree40bf71711635d8e5ad5dc9afe14eb82905661051 /generic/tkIntXlibDecls.h
parent6f20b944ba77825f85992c2f0bcff2dc497236df (diff)
downloadtk-6e3c3db8630f629578ea034020ae7d920aadf4ce.zip
tk-6e3c3db8630f629578ea034020ae7d920aadf4ce.tar.gz
tk-6e3c3db8630f629578ea034020ae7d920aadf4ce.tar.bz2
* generic/tkImgGIF.c (FileReadGIF): added cast for trashBuffer
* generic/tkIntXlibDecls.h: * generic/tkInt.decls: declared some Xlib emulation calls for the Mac * generic/tkFrame.c (TkInstallFrameMenu): added extra panic to inform user of bad call when framePtr is NULL [Bug: 2530] * generic/tkMenu.c (DestroyMenuInstance): Placed checks around menu name objects before trying to incr the ref. [Bug: 3402] * generic/tkTest.c: removed USE_OLD_IMAGE def for Mac
Diffstat (limited to 'generic/tkIntXlibDecls.h')
-rw-r--r--generic/tkIntXlibDecls.h54
1 files changed, 53 insertions, 1 deletions
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 5f22fd8..36cdcf9 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -9,7 +9,7 @@
* Copyright (c) 1998-1999 by Scriptics Corporation.
* All rights reserved.
*
- * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.12 1999/12/14 06:52:29 hobbs Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.13 2000/02/10 08:52:34 hobbs Exp $
*/
#ifndef _TKINTXLIBDECLS
@@ -629,6 +629,28 @@ EXTERN void XDrawLine _ANSI_ARGS_((Display* d, Drawable dr, GC g,
EXTERN void XFillRectangle _ANSI_ARGS_((Display* display,
Drawable d, GC gc, int x, int y,
unsigned int width, unsigned int height));
+/* 84 */
+EXTERN void XClearWindow _ANSI_ARGS_((Display* d, Window w));
+/* 85 */
+EXTERN void XDrawPoint _ANSI_ARGS_((Display* display, Drawable d,
+ GC gc, int x, int y));
+/* 86 */
+EXTERN void XDrawPoints _ANSI_ARGS_((Display* display,
+ Drawable d, GC gc, XPoint * points,
+ int npoints, int mode));
+/* 87 */
+EXTERN void XWarpPointer _ANSI_ARGS_((Display* display,
+ Window src_w, Window dest_w, int src_x,
+ int src_y, unsigned int src_width,
+ unsigned int src_height, int dest_x,
+ int dest_y));
+/* 88 */
+EXTERN void XQueryColor _ANSI_ARGS_((Display * display,
+ Colormap colormap, XColor * def_in_out));
+/* 89 */
+EXTERN void XQueryColors _ANSI_ARGS_((Display * display,
+ Colormap colormap, XColor * defs_in_out,
+ int ncolors));
#endif /* MAC_TCL */
typedef struct TkIntXlibStubs {
@@ -829,6 +851,12 @@ typedef struct TkIntXlibStubs {
void (*xForceScreenSaver) _ANSI_ARGS_((Display* display, int mode)); /* 81 */
void (*xDrawLine) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */
void (*xFillRectangle) _ANSI_ARGS_((Display* display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */
+ void (*xClearWindow) _ANSI_ARGS_((Display* d, Window w)); /* 84 */
+ void (*xDrawPoint) _ANSI_ARGS_((Display* display, Drawable d, GC gc, int x, int y)); /* 85 */
+ void (*xDrawPoints) _ANSI_ARGS_((Display* display, Drawable d, GC gc, XPoint * points, int npoints, int mode)); /* 86 */
+ void (*xWarpPointer) _ANSI_ARGS_((Display* display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */
+ void (*xQueryColor) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * def_in_out)); /* 88 */
+ void (*xQueryColors) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * defs_in_out, int ncolors)); /* 89 */
#endif /* MAC_TCL */
} TkIntXlibStubs;
@@ -1610,6 +1638,30 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
#define XFillRectangle \
(tkIntXlibStubsPtr->xFillRectangle) /* 83 */
#endif
+#ifndef XClearWindow
+#define XClearWindow \
+ (tkIntXlibStubsPtr->xClearWindow) /* 84 */
+#endif
+#ifndef XDrawPoint
+#define XDrawPoint \
+ (tkIntXlibStubsPtr->xDrawPoint) /* 85 */
+#endif
+#ifndef XDrawPoints
+#define XDrawPoints \
+ (tkIntXlibStubsPtr->xDrawPoints) /* 86 */
+#endif
+#ifndef XWarpPointer
+#define XWarpPointer \
+ (tkIntXlibStubsPtr->xWarpPointer) /* 87 */
+#endif
+#ifndef XQueryColor
+#define XQueryColor \
+ (tkIntXlibStubsPtr->xQueryColor) /* 88 */
+#endif
+#ifndef XQueryColors
+#define XQueryColors \
+ (tkIntXlibStubsPtr->xQueryColors) /* 89 */
+#endif
#endif /* MAC_TCL */
#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */