Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch bug-91ca777b4d-alt Excluding Merge-Ins
This is equivalent to a diff from cf74461b to 55503ee1
2022-07-19
| ||
22:59 | merge bug-91ca777b4d-alt since that branch has the fix we want to keep to fix [91ca777b4d]. Closed-Leaf check-in: bf99ae5c user: fvogel tags: bug-91ca777b4d | |
2022-07-17
| ||
10:29 | Alternative fix for [91ca777b4d]: ttk::notebook loose control over content of tabs on MacOS. The TkMacOSXHandleMapOrUnmap machinery may not be needed anymore (experimental). Closed-Leaf check-in: 55503ee1 user: fvogel tags: bug-91ca777b4d-alt | |
2022-07-16
| ||
13:35 | Restore the fix from chw. check-in: cf74461b user: fvogel tags: bug-91ca777b4d | |
10:10 | Remove debug output (leftover in previous commit). check-in: 8a8bd572 user: fvogel tags: bug-91ca777b4d | |
Changes to generic/tkWindow.c.
︙ | ︙ | |||
1744 1745 1746 1747 1748 1749 1750 | event.type = MapNotify; event.xmap.serial = LastKnownRequestProcessed(winPtr->display); event.xmap.send_event = False; event.xmap.display = winPtr->display; event.xmap.event = winPtr->window; event.xmap.window = winPtr->window; event.xmap.override_redirect = winPtr->atts.override_redirect; | | | 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 | event.type = MapNotify; event.xmap.serial = LastKnownRequestProcessed(winPtr->display); event.xmap.send_event = False; event.xmap.display = winPtr->display; event.xmap.event = winPtr->window; event.xmap.window = winPtr->window; event.xmap.override_redirect = winPtr->atts.override_redirect; Tk_HandleEvent(&event); } /* *-------------------------------------------------------------- * * Tk_MakeWindowExist -- * |
︙ | ︙ | |||
1906 1907 1908 1909 1910 1911 1912 | event.type = UnmapNotify; event.xunmap.serial = LastKnownRequestProcessed(winPtr->display); event.xunmap.send_event = False; event.xunmap.display = winPtr->display; event.xunmap.event = winPtr->window; event.xunmap.window = winPtr->window; event.xunmap.from_configure = False; | | | 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 | event.type = UnmapNotify; event.xunmap.serial = LastKnownRequestProcessed(winPtr->display); event.xunmap.send_event = False; event.xunmap.display = winPtr->display; event.xunmap.event = winPtr->window; event.xunmap.window = winPtr->window; event.xunmap.from_configure = False; Tk_HandleEvent(&event); } } void Tk_ConfigureWindow( Tk_Window tkwin, /* Window to re-configure. */ unsigned int valueMask, /* Mask indicating which parts of *valuePtr |
︙ | ︙ |
Changes to generic/ttk/ttkNotebook.c.
︙ | ︙ | |||
677 678 679 680 681 682 683 | */ static void SelectNearestTab(Notebook *nb) { int currentIndex = nb->notebook.currentIndex; int nextIndex = NextTab(nb, currentIndex); if (currentIndex >= 0) { | < | 677 678 679 680 681 682 683 684 685 686 687 688 689 690 | */ static void SelectNearestTab(Notebook *nb) { int currentIndex = nb->notebook.currentIndex; int nextIndex = NextTab(nb, currentIndex); if (currentIndex >= 0) { Ttk_UnmapContent(nb->notebook.mgr, currentIndex); } if (currentIndex != nextIndex) { TtkSendVirtualEvent(nb->core.tkwin, "NotebookTabChanged"); } nb->notebook.currentIndex = nextIndex; |
︙ | ︙ |
Changes to macosx/tkMacOSXPort.h.
︙ | ︙ | |||
188 189 190 191 192 193 194 | * Used by xcolor.c */ MODULE_SCOPE unsigned long TkMacOSXRGBPixel(unsigned long red, unsigned long green, unsigned long blue); #define TkpGetPixel(p) (TkMacOSXRGBPixel(p->red >> 8, p->green >> 8, p->blue >> 8)) | < < < < < < < < | 188 189 190 191 192 193 194 195 196 197 198 199 200 201 | * Used by xcolor.c */ MODULE_SCOPE unsigned long TkMacOSXRGBPixel(unsigned long red, unsigned long green, unsigned long blue); #define TkpGetPixel(p) (TkMacOSXRGBPixel(p->red >> 8, p->green >> 8, p->blue >> 8)) /* * Used by tkAppInit */ #define USE_CUSTOM_EXIT_PROC EXTERN int TkpWantsExitProc(void); EXTERN TCL_NORETURN void TkpExitProc(void *); |
︙ | ︙ |
Changes to macosx/tkMacOSXWm.c.
︙ | ︙ | |||
741 742 743 744 745 746 747 | Tk_ManageGeometry((Tk_Window)winPtr, &wmMgrType, NULL); } /* *---------------------------------------------------------------------- * | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 741 742 743 744 745 746 747 748 749 750 751 752 753 754 | Tk_ManageGeometry((Tk_Window)winPtr, &wmMgrType, NULL); } /* *---------------------------------------------------------------------- * * TkWmMapWindow -- * * This procedure is invoked to map a top-level window. This module gets * a chance to update all window-manager-related information in * properties before the window manager sees the map event and checks the * properties. It also gets to decide whether or not to even map the * window after all. |
︙ | ︙ | |||
912 913 914 915 916 917 918 | event.xany.serial = LastKnownRequestProcessed(winPtr->display); event.xany.send_event = False; event.xany.display = winPtr->display; event.xmap.window = winPtr->window; event.xmap.type = MapNotify; event.xmap.event = winPtr->window; event.xmap.override_redirect = winPtr->atts.override_redirect; | | | 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 | event.xany.serial = LastKnownRequestProcessed(winPtr->display); event.xany.send_event = False; event.xany.display = winPtr->display; event.xmap.window = winPtr->window; event.xmap.type = MapNotify; event.xmap.event = winPtr->window; event.xmap.override_redirect = winPtr->atts.override_redirect; Tk_HandleEvent(&event); } /* *---------------------------------------------------------------------- * * TkWmUnmapWindow -- * |
︙ | ︙ | |||
948 949 950 951 952 953 954 | event.xany.display = winPtr->display; event.xunmap.type = UnmapNotify; event.xunmap.window = winPtr->window; event.xunmap.event = winPtr->window; event.xunmap.from_configure = false; winPtr->flags &= ~TK_MAPPED; XUnmapWindow(winPtr->display, winPtr->window); | | | 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 | event.xany.display = winPtr->display; event.xunmap.type = UnmapNotify; event.xunmap.window = winPtr->window; event.xunmap.event = winPtr->window; event.xunmap.from_configure = false; winPtr->flags &= ~TK_MAPPED; XUnmapWindow(winPtr->display, winPtr->window); Tk_HandleEvent(&event); } /* *---------------------------------------------------------------------- * * TkWmDeadWindow -- * |
︙ | ︙ |
Changes to unix/tkUnixPort.h.
︙ | ︙ | |||
190 191 192 193 194 195 196 | */ #ifndef __CYGWIN__ #define TkpPrintWindowId(buf,w) \ sprintf((buf), "0x%08lx", (unsigned long) (w)) #endif | < < < < < < | 190 191 192 193 194 195 196 197 | */ #ifndef __CYGWIN__ #define TkpPrintWindowId(buf,w) \ sprintf((buf), "0x%08lx", (unsigned long) (w)) #endif #endif /* _UNIXPORT */ |
Changes to win/tkWinPort.h.
︙ | ︙ | |||
121 122 123 124 125 126 127 | /* * The following Tk functions are implemented as macros under Windows. */ #define TkpGetPixel(p) (((((p)->red >> 8) & 0xff) \ | ((p)->green & 0xff00) | (((p)->blue << 8) & 0xff0000)) | 0x20000000) | < < < < < < | 121 122 123 124 125 126 127 128 129 130 131 132 133 134 | /* * The following Tk functions are implemented as macros under Windows. */ #define TkpGetPixel(p) (((((p)->red >> 8) & 0xff) \ | ((p)->green & 0xff00) | (((p)->blue << 8) & 0xff0000)) | 0x20000000) /* * These calls implement native bitmaps which are not currently * supported under Windows. The macros eliminate the calls. */ #define TkpDefineNativeBitmaps() #define TkpCreateNativeBitmap(display, source) None |
︙ | ︙ |