Fix for [f476e3d654]: Tk trunk fails to build/link
Fix [52ca3e7f55]: XkbOpenDisplay macro incorrect when HAVE_XKBKEYCODETOKEYSYM is not defined
Fix [52ca3e7f55]: XkbOpenDisplay macro incorrect when HAVE_XKBKEYCODETOKEYSYM is not defined
merge trunk