From 116741cb7186ebb706dc188e0c6368a81980f88b Mon Sep 17 00:00:00 2001 From: fvogel Date: Thu, 19 Sep 2024 21:01:03 +0000 Subject: [PATCH 1/2] Fix [18e9840f84]: Assignment of invalid symbolic constant NotifyNormal --- generic/tkPointer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generic/tkPointer.c b/generic/tkPointer.c index 905489a72..bb21a133d 100644 --- a/generic/tkPointer.c +++ b/generic/tkPointer.c @@ -182,7 +182,7 @@ GenerateEnterLeave( */ InitializeEvent(&event, targetPtr, LeaveNotify, x, y, state, - NotifyNormal); + NotifyAncestor); TkInOutEvents(&event, lastWinPtr, winPtr, LeaveNotify, EnterNotify, TCL_QUEUE_TAIL); @@ -387,7 +387,7 @@ Tk_UpdatePointer( if (targetWinPtr != NULL) { InitializeEvent(&event, targetWinPtr, MotionNotify, x, y, - tsdPtr->lastState, NotifyNormal); + tsdPtr->lastState, NotifyAncestor); Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL); } tsdPtr->lastPos = pos; From d8be6f24e6f90e56a907452aaa6f5a609204d2fd Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Fri, 20 Sep 2024 13:21:22 +0000 Subject: [PATCH 2/2] (slightly modified) proposed fix for [3981091ed3]: Segmentation fault with bogus resource value (X11) --- generic/ttk/ttkTheme.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c index 730de5d8d..0e027b258 100644 --- a/generic/ttk/ttkTheme.c +++ b/generic/ttk/ttkTheme.c @@ -534,9 +534,10 @@ void Ttk_TkDestroyedHandler( StylePackageData* pkgPtr = GetStylePackageData(interp); /* - * Cancel any pending ThemeChanged calls: + * Cancel any pending ThemeChanged calls. We might be called + * before Ttk is initialized. See bug [3981091ed336]. */ - if (pkgPtr->themeChangePending) { + if (pkgPtr && pkgPtr->themeChangePending) { Tcl_CancelIdleCall(ThemeChangedProc, pkgPtr); } }