diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-05-17 07:21:59 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-05-17 07:21:59 (GMT) |
| commit | 19351002aaa78f907ef8b1fabb4814b74aaca32c (patch) | |
| tree | 842b4a7e3459bfcf099a6cdddee7bdda2220305b /macosx | |
| parent | 423e8c0ec8c6d081b376adcc7cd1040ef6105dfd (diff) | |
| download | tk-19351002aaa78f907ef8b1fabb4814b74aaca32c.zip tk-19351002aaa78f907ef8b1fabb4814b74aaca32c.tar.gz tk-19351002aaa78f907ef8b1fabb4814b74aaca32c.tar.bz2 | |
Add missing INT2PTR (doesn't cause warning with Tcl8.x, but does with Tcl 9.0). One None -> NULL change which was still missing. Backported from trunk.
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXDialog.c | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXKeyboard.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c index 90d0dc7..322519a 100644 --- a/macosx/tkMacOSXDialog.c +++ b/macosx/tkMacOSXDialog.c @@ -2080,7 +2080,7 @@ FontchooserParentEventHandler( if (eventPtr->type == DestroyNotify) { Tk_DeleteEventHandler(fcdPtr->parent, StructureNotifyMask, FontchooserParentEventHandler, fcdPtr); - fcdPtr->parent = None; + fcdPtr->parent = NULL; FontchooserHideCmd(NULL, NULL, 0, NULL); } } diff --git a/macosx/tkMacOSXKeyboard.c b/macosx/tkMacOSXKeyboard.c index 31f842a..5899064 100644 --- a/macosx/tkMacOSXKeyboard.c +++ b/macosx/tkMacOSXKeyboard.c @@ -180,13 +180,13 @@ InitKeyMaps(void) for (kPtr = keyArray; kPtr->keycode != 0; kPtr++) { hPtr = Tcl_CreateHashEntry(&keycodeTable, INT2PTR(kPtr->keycode), &dummy); - Tcl_SetHashValue(hPtr, kPtr->keysym); + Tcl_SetHashValue(hPtr, INT2PTR(kPtr->keysym)); } Tcl_InitHashTable(&vkeyTable, TCL_ONE_WORD_KEYS); for (kPtr = virtualkeyArray; kPtr->keycode != 0; kPtr++) { hPtr = Tcl_CreateHashEntry(&vkeyTable, INT2PTR(kPtr->keycode), &dummy); - Tcl_SetHashValue(hPtr, kPtr->keysym); + Tcl_SetHashValue(hPtr, INT2PTR(kPtr->keysym)); } initialized = 1; } |