summaryrefslogtreecommitdiffstats
path: root/generic/tkFont.c
diff options
context:
space:
mode:
authorculler <culler>2020-05-29 18:30:28 (GMT)
committerculler <culler>2020-05-29 18:30:28 (GMT)
commit4996dd8c53efd46d1b66d080e7c4a7faead1d373 (patch)
tree0e14390802c437353ff15164830fd8e242a0c535 /generic/tkFont.c
parent18fd1bf89685a067ea6ad92d6b1d7f260394ddce (diff)
parent9ba4c746ec344f1455e03c2f97ca0ae7c95d139f (diff)
downloadtk-4996dd8c53efd46d1b66d080e7c4a7faead1d373.zip
tk-4996dd8c53efd46d1b66d080e7c4a7faead1d373.tar.gz
tk-4996dd8c53efd46d1b66d080e7c4a7faead1d373.tar.bz2
Remove some unnecessary macOS conditional code by using internal stubs.
Diffstat (limited to 'generic/tkFont.c')
-rw-r--r--generic/tkFont.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c
index 34f8921..289a4d0 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -13,9 +13,7 @@
#include "tkInt.h"
#include "tkFont.h"
-#if defined(MAC_OSX_TK)
-#include "tkMacOSXInt.h"
-#endif
+
/*
* The following structure is used to keep track of all the fonts that exist
* in the current application. It must be stored in the TkMainInfo for the
@@ -875,18 +873,18 @@ TheWorldHasChanged(
ClientData clientData) /* Info about application's fonts. */
{
TkFontInfo *fiPtr = (TkFontInfo *)clientData;
-#if defined(MAC_OSX_TK)
/*
* On macOS it is catastrophic to recompute all widgets while the
* [NSView drawRect] method is drawing. The best that we can do in
* that situation is to abort the recomputation and hope for the best.
+ * This is ignored on other platforms.
*/
- if (TkpAppIsDrawing()) {
+ if (TkpAppCanDraw(NULL)) {
return;
}
-#endif
+
fiPtr->updatePending = 0;
RecomputeWidgets(fiPtr->mainPtr->winPtr);
}