summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authormarc_culler <marc.culler@gmail.com>2020-07-18 16:53:31 (GMT)
committermarc_culler <marc.culler@gmail.com>2020-07-18 16:53:31 (GMT)
commitb63b41199525b0e3e0e95f65e6991f75f8e31dd5 (patch)
tree40c8cd9613fe3160eb087628d192d6ee40a35487 /generic
parent451fa4203bff3f5e6a0ab5028f900823174b4c83 (diff)
parent132c939d5ab36c6a55d7bc9e1692fd981c9a88ca (diff)
downloadtk-b63b41199525b0e3e0e95f65e6991f75f8e31dd5.zip
tk-b63b41199525b0e3e0e95f65e6991f75f8e31dd5.tar.gz
tk-b63b41199525b0e3e0e95f65e6991f75f8e31dd5.tar.bz2
Provide better control over how and when [NSView drawRect:] is called.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkFont.c2
-rw-r--r--generic/tkTest.c6
-rw-r--r--generic/ttk/ttkTheme.c8
3 files changed, 4 insertions, 12 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c
index cbe885a..0b858fc 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -883,7 +883,7 @@ TheWorldHasChanged(
* This is ignored on other platforms.
*/
- if (!TkpWillDrawWidget(NULL)) {
+ if (TkpWillDrawWidget(NULL)) {
return;
}
diff --git a/generic/tkTest.c b/generic/tkTest.c
index a8929b9..e80f488 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -31,9 +31,9 @@
#if defined(MAC_OSX_TK)
#include "tkMacOSXInt.h"
#include "tkScrollbar.h"
-#define LOG_DISPLAY TkTestLogDisplay()
+#define LOG_DISPLAY(drawable) TkTestLogDisplay(drawable)
#else
-#define LOG_DISPLAY 1
+#define LOG_DISPLAY(drawable) 1
#endif
#ifdef __UNIX__
@@ -1581,7 +1581,7 @@ ImageDisplay(
* not just the changed portion. Tests must account for this.
*/
- if (LOG_DISPLAY) {
+ if (LOG_DISPLAY(drawable)) {
sprintf(buffer, "%s display %d %d %d %d",
instPtr->masterPtr->imageName, imageX, imageY, width, height);
Tcl_SetVar2(instPtr->masterPtr->interp, instPtr->masterPtr->varName,
diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c
index 6bf48a3..7bde80e 100644
--- a/generic/ttk/ttkTheme.c
+++ b/generic/ttk/ttkTheme.c
@@ -15,13 +15,6 @@
#define PKG_ASSOC_KEY "Ttk"
-#ifdef MAC_OSX_TK
- extern void TkMacOSXFlushWindows(void);
- #define UPDATE_WINDOWS() TkMacOSXFlushWindows()
-#else
- #define UPDATE_WINDOWS()
-#endif
-
/*------------------------------------------------------------------------
* +++ Styles.
*
@@ -517,7 +510,6 @@ static void ThemeChangedProc(ClientData clientData)
Tcl_BackgroundException(pkgPtr->interp, code);
}
pkgPtr->themeChangePending = 0;
- UPDATE_WINDOWS();
}
/*