diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-05 17:16:17 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-05 17:16:17 (GMT) |
commit | 07212f98d3048b772094a64325e930e1c0364964 (patch) | |
tree | b84287c5dcb8f44a6ca6aa867defb43d89c0fd11 /generic/tkStubInit.c | |
parent | acfb83993a6266257e059e30e5dffde280882c11 (diff) | |
parent | 89dda440e266b894bf853efa4fedcad7f19befa5 (diff) | |
download | tk-07212f98d3048b772094a64325e930e1c0364964.zip tk-07212f98d3048b772094a64325e930e1c0364964.tar.gz tk-07212f98d3048b772094a64325e930e1c0364964.tar.bz2 |
merge core-8-4-branch
Diffstat (limited to 'generic/tkStubInit.c')
-rw-r--r-- | generic/tkStubInit.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 22334bc..d4f7d79 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -76,6 +76,7 @@ # define TkSubtractRegion (void (*) _ANSI_ARGS_((TkRegion, TkRegion, TkRegion))) XSubtractRegion # ifdef __CYGWIN__ +# define TkPutImage TkIntXlibPutImage # define Tk_GetHINSTANCE TkPlatGetHINSTANCE # define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS 0x00000004 @@ -96,6 +97,13 @@ static void *Tk_GetHINSTANCE() (const char *) &tkIntStubs, &hInstance); return hInstance; } +static void TkPutImage(unsigned long *colors, int ncolors, Display *display, + Drawable d, GC gc, XImage *image, int destx, int desty, + int srcx, int srcy, unsigned int width, unsigned int height) +{ + XPutImage(display, d, gc, image, destx, desty, srcx, srcy, width, height); +} + /* TODO: To be implemented for Cygwin */ # define Tk_AttachHWND 0 # define Tk_GetHWND 0 @@ -103,8 +111,6 @@ static void *Tk_GetHINSTANCE() # define Tk_PointerEvent 0 # define Tk_TranslateWinEvent 0 -# else /* !__CYGWIN__ */ -# define TkPutImage 0 # endif /* __CYGWIN__ */ # endif /* !MAC_TCL && !MACC_OSX_TCL */ #endif /* !__WIN32__ */ @@ -494,7 +500,7 @@ TkIntPlatStubs tkIntPlatStubs = { TkIntXlibStubs tkIntXlibStubs = { TCL_STUB_MAGIC, NULL, -#ifdef __WIN32__ +#if defined(__WIN32__) || defined(__CYGWIN__) XSetDashes, /* 0 */ XGetModifierMapping, /* 1 */ XCreateImage, /* 2 */ |