Merge 8.6

5 files changed, 9 insertions, 9 deletions

diff --git a/generic/tkFont.c b/generic/tkFont.c
index 448f918..e53e3f9 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -880,7 +880,7 @@ TheWorldHasChanged(
      * This is ignored on other platforms.
      */
 
-    if (TkpAppCanDraw(NULL)) {
+    if (!TkpWillDrawWidget(NULL)) {
 	return;
     }
 
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index da591cb..f6e7ea9 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -640,7 +640,7 @@ declare 185 aqua {
     void TkpRedrawWidget(Tk_Window tkwin)
 }
 declare 186 aqua {
-    int TkpAppCanDraw(Tk_Window tkwin)
+    int TkpWillDrawWidget(Tk_Window tkwin)
 }
 
 
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 7bf9bd7..1344cc6 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -556,7 +556,7 @@ EXTERN void		TkpRedrawWidget(Tk_Window tkwin);
 #endif /* AQUA */
 #ifdef MAC_OSX_TK /* AQUA */
 /* 186 */
-EXTERN int		TkpAppCanDraw(Tk_Window tkwin);
+EXTERN int		TkpWillDrawWidget(Tk_Window tkwin);
 #endif /* AQUA */
 
 typedef struct TkIntStubs {
@@ -793,7 +793,7 @@ typedef struct TkIntStubs {
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     void (*reserved186)(void); /* Dummy entry for stubs table backwards compatibility */
-    int (*tkpAppCanDraw) (Tk_Window tkwin); /* 186 */
+    int (*tkpWillDrawWidget) (Tk_Window tkwin); /* 186 */
 #endif /* AQUA */
 } TkIntStubs;
 
@@ -1172,8 +1172,8 @@ extern const TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkpRedrawWidget) /* 185 */
 #endif /* AQUA */
 #ifdef MAC_OSX_TK /* AQUA */
-#define TkpAppCanDraw \
-	(tkIntStubsPtr->tkpAppCanDraw) /* 186 */
+#define TkpWillDrawWidget \
+	(tkIntStubsPtr->tkpWillDrawWidget) /* 186 */
 #endif /* AQUA */
 
 #endif /* defined(USE_TK_STUBS) */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 045c86e..4abc637 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -503,7 +503,7 @@ static const TkIntStubs tkIntStubs = {
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     0, /* 186 */ /* Dummy entry for stubs table backwards compatibility */
-    TkpAppCanDraw, /* 186 */
+    TkpWillDrawWidget, /* 186 */
 #endif /* AQUA */
 };
 
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 084fd64..2deeaf2 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -22,7 +22,7 @@
 #include "tkUnixInt.h"
 #elif defined(MAC_OSX_TK)
 #include "tkMacOSXInt.h"
-#define OK_TO_LOG (!TkpAppCanDraw(textPtr->tkwin))
+#define OK_TO_LOG (!TkpWillDrawWidget(textPtr->tkwin))
 #endif
 
 #if !defined(MAC_OSX_TK)
@@ -4174,7 +4174,7 @@ DisplayText(
 				 * warnings. */
     Tcl_Interp *interp;
 
-    
+
     if ((textPtr->tkwin == NULL) || (textPtr->flags & DESTROYED)) {
 	/*
 	 * The widget has been deleted.	 Don't do anything.