diff options
Diffstat (limited to 'macosx/tkMacOSXPort.h')
| -rw-r--r-- | macosx/tkMacOSXPort.h | 42 |
1 files changed, 7 insertions, 35 deletions
diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h index 2f4a6d3..c56e7cf 100644 --- a/macosx/tkMacOSXPort.h +++ b/macosx/tkMacOSXPort.h @@ -25,7 +25,6 @@ #include <math.h> #include <string.h> #include <limits.h> -#include <stdlib.h> #include <sys/types.h> #include <sys/file.h> #ifdef HAVE_SYS_SELECT_H @@ -39,9 +38,7 @@ # include <sys/time.h> #endif #include <time.h> -#ifdef HAVE_INTTYPES_H -# include <inttypes.h> -#endif +#include <inttypes.h> #include <unistd.h> #if defined(__GNUC__) && !defined(__cplusplus) # pragma GCC diagnostic ignored "-Wc++-compat" @@ -118,26 +115,6 @@ #define REDO_KEYSYM_LOOKUP /* - * Defines for X functions that are used by Tk but are treated as - * no-op functions on the Macintosh. - */ - -#undef XFlush -#define XFlush(display) (0) -#undef XFree -#define XFree(data) (((data) != NULL) ? (ckfree(data),0) : 0) -#undef XGrabServer -#define XGrabServer(display) (0) -#undef XNoOp -#define XNoOp(display) (LastKnownRequestProcessed(display)++,0) -#undef XUngrabServer -#define XUngrabServer(display) (0) -#undef XSynchronize -#define XSynchronize(display, onoff) (LastKnownRequestProcessed(display)++,NULL) -#undef XVisualIDFromVisual -#define XVisualIDFromVisual(visual) (visual->visualid) - -/* * The following functions are not used on the Mac, so we stub them out. */ @@ -147,17 +124,6 @@ #define TkpSync(display) /* - * TkMacOSXGetCapture is a legacy function used on the Mac. When fixing - * [943d5ebe51], TkpGetCapture was added to the Windows port. Both - * are actually the same feature and should bear the same name. However, - * in order to avoid potential backwards incompatibilities, renaming - * TkMacOSXGetCapture into TkpGetCapture in *PlatDecls.h shall not be - * done in a patch release, therefore use a define here. - */ - -#define TkpGetCapture TkMacOSXGetCapture - -/* * This macro stores a representation of the window handle in a string. */ @@ -185,6 +151,12 @@ MODULE_SCOPE int TkpPutRGBAImage( unsigned int width, unsigned int height); /* + * Inform tkCanvas.c that our XGetImage returns a 32pp pixmap packed as 0xAABBGGRR + */ + +#define TK_XGETIMAGE_USES_ABGR32 + +/* * Used by xcolor.c */ |