diff options
| -rw-r--r-- | generic/tkFont.c | 2 | ||||
| -rw-r--r-- | generic/tkInt.decls | 2 | ||||
| -rw-r--r-- | generic/tkIntDecls.h | 8 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 2 | ||||
| -rw-r--r-- | generic/tkTextDisp.c | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXWindowEvent.c | 4 | ||||
| -rw-r--r-- | unix/tkUnixPort.h | 2 | ||||
| -rw-r--r-- | win/tkWinPort.h | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c index 289a4d0..98a10f4 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -881,7 +881,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 04f7d7d..df1e9b2 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -646,7 +646,7 @@ declare 186 aqua { void TkpRedrawWidget(Tk_Window tkwin) } declare 187 aqua { - int TkpAppCanDraw(Tk_Window tkwin) + int TkpWillDrawWidget(Tk_Window tkwin) } diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index 1274b71..886964d 100644 --- a/generic/tkIntDecls.h +++ b/generic/tkIntDecls.h @@ -568,7 +568,7 @@ EXTERN void TkpRedrawWidget(Tk_Window tkwin); #endif /* AQUA */ #ifdef MAC_OSX_TK /* AQUA */ /* 187 */ -EXTERN int TkpAppCanDraw(Tk_Window tkwin); +EXTERN int TkpWillDrawWidget(Tk_Window tkwin); #endif /* AQUA */ typedef struct TkIntStubs { @@ -806,7 +806,7 @@ typedef struct TkIntStubs { #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ void (*reserved187)(void); /* Dummy entry for stubs table backwards compatibility */ - int (*tkpAppCanDraw) (Tk_Window tkwin); /* 187 */ + int (*tkpWillDrawWidget) (Tk_Window tkwin); /* 187 */ #endif /* AQUA */ } TkIntStubs; @@ -1187,8 +1187,8 @@ extern const TkIntStubs *tkIntStubsPtr; (tkIntStubsPtr->tkpRedrawWidget) /* 186 */ #endif /* AQUA */ #ifdef MAC_OSX_TK /* AQUA */ -#define TkpAppCanDraw \ - (tkIntStubsPtr->tkpAppCanDraw) /* 187 */ +#define TkpWillDrawWidget \ + (tkIntStubsPtr->tkpWillDrawWidget) /* 187 */ #endif /* AQUA */ #endif /* defined(USE_TK_STUBS) */ diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 9b6bb33..a0125a8 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -513,7 +513,7 @@ static const TkIntStubs tkIntStubs = { #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ 0, /* 187 */ /* Dummy entry for stubs table backwards compatibility */ - TkpAppCanDraw, /* 187 */ + TkpWillDrawWidget, /* 187 */ #endif /* AQUA */ }; diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index 88ad4e6..61b0df0 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) @@ -4175,7 +4175,7 @@ DisplayText( * warnings. */ Tcl_Interp *interp; - + if ((textPtr->tkwin == NULL) || (textPtr->flags & DESTROYED)) { /* * The widget has been deleted. Don't do anything. diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index 322643e..05e2ac2 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -394,7 +394,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification; /* *---------------------------------------------------------------------- * - * TkpAppCanDraw -- + * TkpWillDrawWidget -- * * A widget display procedure can call this to determine whether it is * being run inside of the drawRect method. If not, it may be desirable @@ -418,7 +418,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification; */ int -TkpAppCanDraw(Tk_Window tkwin) { +TkpWillDrawWidget(Tk_Window tkwin) { if (![NSApp isDrawing]) { return 0; } diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h index 358a67c..a72c0fe 100644 --- a/unix/tkUnixPort.h +++ b/unix/tkUnixPort.h @@ -149,7 +149,7 @@ #define TkpButtonSetDefaults() {} #define TkpDestroyButton(butPtr) {} -#define TkpAppCanDraw(tkwin) 1 +#define TkpWillDrawWidget(tkwin) 1 #define TkpRedrawWidget(tkwin) #define TkSelUpdateClipboard(a,b) {} #ifndef __CYGWIN__ diff --git a/win/tkWinPort.h b/win/tkWinPort.h index 86f212e..880c952 100644 --- a/win/tkWinPort.h +++ b/win/tkWinPort.h @@ -133,7 +133,7 @@ * Other functions not used under Windows */ -#define TkpAppCanDraw(tkwin) 1 +#define TkpWillDrawWidget(tkwin) 1 #define TkpRedrawWidget(tkwin) #endif /* _WINPORT */ |