diff options
| author | fvogel <fvogelnew1@free.fr> | 2022-07-17 10:29:51 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2022-07-17 10:29:51 (GMT) |
| commit | 0d8d3d054149773afa5cc4de51772d3625a356a8 (patch) | |
| tree | bb59c68d887e9b15b0edf16ea0dfcc4facb955ed /generic | |
| parent | acc3151d3e5fc750432e4c4dc614255b0da946de (diff) | |
| download | tk-0d8d3d054149773afa5cc4de51772d3625a356a8.zip tk-0d8d3d054149773afa5cc4de51772d3625a356a8.tar.gz tk-0d8d3d054149773afa5cc4de51772d3625a356a8.tar.bz2 | |
Alternative fix for [91ca777b4d]: ttk::notebook loose control over content of tabs on MacOS. The TkMacOSXHandleMapOrUnmap machinery may not be needed anymore (experimental).
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkWindow.c | 4 | ||||
| -rw-r--r-- | generic/ttk/ttkNotebook.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 7506d2f..fa25553 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -1748,7 +1748,7 @@ Tk_MapWindow( event.xmap.event = winPtr->window; event.xmap.window = winPtr->window; event.xmap.override_redirect = winPtr->atts.override_redirect; - TkpHandleMapOrUnmap((Tk_Window)winPtr, &event); + Tk_HandleEvent(&event); } /* @@ -1910,7 +1910,7 @@ Tk_UnmapWindow( event.xunmap.event = winPtr->window; event.xunmap.window = winPtr->window; event.xunmap.from_configure = False; - TkpHandleMapOrUnmap((Tk_Window)winPtr, &event); + Tk_HandleEvent(&event); } } diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c index db86500..71cbadd 100644 --- a/generic/ttk/ttkNotebook.c +++ b/generic/ttk/ttkNotebook.c @@ -681,7 +681,6 @@ static void SelectNearestTab(Notebook *nb) int nextIndex = NextTab(nb, currentIndex); if (currentIndex >= 0) { - nb->notebook.currentIndex = -1; Ttk_UnmapContent(nb->notebook.mgr, currentIndex); } if (currentIndex != nextIndex) { |