From b580fd6f6e6ba0f5e4c16b9c158225fd1d6e322a Mon Sep 17 00:00:00 2001 From: fvogel Date: Sun, 6 Aug 2017 18:46:07 +0000 Subject: Fix [28d0b8fb2f]: Delete the property used for X selection conversion before requesting the conversion. Patch from 'dpb' --- unix/tkUnixSelect.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/unix/tkUnixSelect.c b/unix/tkUnixSelect.c index 4bb462e..dacbd99 100644 --- a/unix/tkUnixSelect.c +++ b/unix/tkUnixSelect.c @@ -166,6 +166,13 @@ TkSelGetSelection( pendingRetrievals = &retr; /* + * Delete the property to indicate that no parameters are supplied for + * the conversion request. + */ + + XDeleteProperty(winPtr->display, retr.winPtr->window, retr.property); + + /* * Initiate the request for the selection. Note: can't use TkCurrentTime * for the time. If we do, and this application hasn't received any X * events in a long time, the current time will be way in the past and -- cgit v0.12 From 49644f7f4298d5bd2038227bd5db4401e2f881a6 Mon Sep 17 00:00:00 2001 From: fvogel Date: Tue, 8 Aug 2017 19:31:09 +0000 Subject: Fix [4966cad4d4]: Wrong tab shown in ttk::notebook. Patch from Gregor Cramer. Cherrypicked [e033e444]. --- generic/ttk/ttkNotebook.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c index 83d7db9..56439a6 100644 --- a/generic/ttk/ttkNotebook.c +++ b/generic/ttk/ttkNotebook.c @@ -627,9 +627,12 @@ static void SelectTab(Notebook *nb, int index) Ttk_UnmapSlave(nb->notebook.mgr, currentIndex); } - NotebookPlaceSlave(nb, index); - + /* Must be set before calling NotebookPlaceSlave(), otherwise it may + * happen that NotebookPlaceSlaves(), triggered by an interveaning + * geometry request, will swap to old index. */ nb->notebook.currentIndex = index; + + NotebookPlaceSlave(nb, index); TtkRedisplayWidget(&nb->core); TtkSendVirtualEvent(nb->core.tkwin, "NotebookTabChanged"); -- cgit v0.12