diff options
| author | fvogel <fvogelnew1@free.fr> | 2016-08-29 15:28:20 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2016-08-29 15:28:20 (GMT) |
| commit | 992eb3df2d03dec6291784e8dca7e6d85b279c7a (patch) | |
| tree | c885db53fd7bd38e3971e2b93242b2e798961ee9 /xlib | |
| parent | 1052e56fe96f3ece407a6374714af0302c9a5e3c (diff) | |
| parent | 76052445ac39afd2c455431d80335dd464ed755e (diff) | |
| download | tk-tip_449.zip tk-tip_449.tar.gz tk-tip_449.tar.bz2 | |
Rebased to trunk since TIP #449 was accepted for merging to trunk only, not to core-8-6-branchtip_449
Diffstat (limited to 'xlib')
| -rw-r--r-- | xlib/X11/Xlib.h | 3 | ||||
| -rw-r--r-- | xlib/X11/Xutil.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h index 667bdc7..8d8ec68 100644 --- a/xlib/X11/Xlib.h +++ b/xlib/X11/Xlib.h @@ -330,6 +330,9 @@ typedef struct _XImage { unsigned long green_mask; unsigned long blue_mask; XPointer obdata; /* hook for the object routines to hang on */ +#if defined(MAC_OSX_TK) + int pixelpower; /* n such that pixels are 2^n x 2^n blocks*/ +#endif struct funcs { /* image manipulation routines */ struct _XImage *(*create_image)(); #if NeedFunctionPrototypes diff --git a/xlib/X11/Xutil.h b/xlib/X11/Xutil.h index 58124b0..bf372fb 100644 --- a/xlib/X11/Xutil.h +++ b/xlib/X11/Xutil.h @@ -535,7 +535,7 @@ extern Status XMatchVisualInfo( #endif ); -extern void XOffsetRegion( +extern int XOffsetRegion( #if NeedFunctionPrototypes Region /* r */, int /* dx */, @@ -814,7 +814,7 @@ extern void XUnionRectWithRegion( #endif ); -extern void XUnionRegion( +extern int XUnionRegion( #if NeedFunctionPrototypes Region /* sra */, Region /* srb */, |