diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-08 13:28:07 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-08 13:28:07 (GMT) |
| commit | 627528287a3e418209bf5d940d4920c52d3be9f6 (patch) | |
| tree | a29fb8fbcd5dcbfa3c49d62fbc1cee66b28e166d /generic/tkStubInit.c | |
| parent | 084797b718b0d03429fabc4997ff3f9695f9bd24 (diff) | |
| parent | c15768b7bff4bdebe68c0856c364accbef57cfd3 (diff) | |
| download | tk-627528287a3e418209bf5d940d4920c52d3be9f6.zip tk-627528287a3e418209bf5d940d4920c52d3be9f6.tar.gz tk-627528287a3e418209bf5d940d4920c52d3be9f6.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tkStubInit.c')
| -rw-r--r-- | generic/tkStubInit.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 686fa80..bdcc4ae 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -81,10 +81,11 @@ doNothing(void) } #endif #else -static void +static void * doNothing(void) { /* dummy implementation, no need to do anything */ + return NULL; } #define Tk_FreeXId ((void (*)(Display *, XID))(void *)doNothing) #define Tk_FreeStyleFromObj ((void (*)(Tcl_Obj *))(void *)doNothing) @@ -113,6 +114,12 @@ static Tk_Style Tk_GetStyleFromObj(Tcl_Obj *obj) (const char *(*) (void *,Tk_Window, char *, int, \ Tcl_FreeProc **))(void *)TkCanvasTagsPrintProc +#if !defined(MAC_OSX_TK) +# undef TkpWillDrawWidget +# undef TkpRedrawWidget +# define TkpWillDrawWidget ((int (*)(Tk_Window))(void *)doNothing) +# define TkpRedrawWidget ((void (*)(Tk_Window))(void *)doNothing) +#endif #ifdef _WIN32 @@ -501,26 +508,24 @@ static const TkIntStubs tkIntStubs = { TkUnderlineAngledTextLayout, /* 182 */ TkIntersectAngledTextLayout, /* 183 */ TkDrawAngledChars, /* 184 */ -#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */ +#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */ 0, /* 185 */ -#endif /* X11 */ +#endif /* UNIX */ #if defined(_WIN32) /* WIN */ 0, /* 185 */ #endif /* WIN */ -#ifdef MAC_OSX_TK /* AQUA */ - 0, /* 185 */ /* Dummy entry for stubs table backwards compatibility */ +#ifdef MAC_OSX_TCL /* MACOSX */ TkpRedrawWidget, /* 185 */ -#endif /* AQUA */ -#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */ +#endif /* MACOSX */ +#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */ 0, /* 186 */ -#endif /* X11 */ +#endif /* UNIX */ #if defined(_WIN32) /* WIN */ 0, /* 186 */ #endif /* WIN */ -#ifdef MAC_OSX_TK /* AQUA */ - 0, /* 186 */ /* Dummy entry for stubs table backwards compatibility */ +#ifdef MAC_OSX_TCL /* MACOSX */ TkpWillDrawWidget, /* 186 */ -#endif /* AQUA */ +#endif /* MACOSX */ TkDebugPhotoStringMatchDef, /* 187 */ }; |