diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-01-03 22:53:52 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-01-03 22:53:52 (GMT) |
| commit | 5e7bcea28317ca7b25fe5cad6c4878ae6d048148 (patch) | |
| tree | fa159b5ba85dfe5e5f6bcc39ce82a2b3e5a5257f /generic | |
| parent | 7d85ac413b4e553d5dafb103cc70a88b04363083 (diff) | |
| parent | 4a2f9cd3136ff5688322300fcf27e1ab463737df (diff) | |
| download | tk-5e7bcea28317ca7b25fe5cad6c4878ae6d048148.zip tk-5e7bcea28317ca7b25fe5cad6c4878ae6d048148.tar.gz tk-5e7bcea28317ca7b25fe5cad6c4878ae6d048148.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkIntPlatDecls.h | 2 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index 7a00bf1..c3164da 100644 --- a/generic/tkIntPlatDecls.h +++ b/generic/tkIntPlatDecls.h @@ -789,6 +789,8 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr; #undef TkpTestsendCmd_ #undef TkGenerateActivateEvents_ #undef TkMacOSXSetUpClippingRgn +#undef TkMacOSXIsCharacterMissing +#define TkMacOSXIsCharacterMissing(tkfont) ((void)tkfont, 0) #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 309f162..8d37ed4 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -47,6 +47,8 @@ MODULE_SCOPE const TkStubs tkStubs; #undef TkPutImage #undef XPutImage #define TkMacOSXSetUpClippingRgn (void (*)(Drawable))(void *)doNothing +#undef TkMacOSXIsCharacterMissing +#define TkMacOSXIsCharacterMissing (int (*)(Tk_Font, unsigned int))(void *)doNothing #if defined(_WIN32) && !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 # define Tk_TranslateWinEvent TkTranslateWinEvent |