diff options
author | dgp <dgp@noemail.net> | 2015-02-24 15:10:40 (GMT) |
---|---|---|
committer | dgp <dgp@noemail.net> | 2015-02-24 15:10:40 (GMT) |
commit | 4a5e67634a03327c663552f5f742a3f5d6d9fd8f (patch) | |
tree | f735bcdffc5bd8ff7a33bfb9ea4a18619029a18a /generic | |
parent | 5efb8bf65a66beab3fd5c447c3a7c021b666b10f (diff) | |
parent | 8072eca244981a8bfb0b828a9a1c66210981d754 (diff) | |
download | tk-4a5e67634a03327c663552f5f742a3f5d6d9fd8f.zip tk-4a5e67634a03327c663552f5f742a3f5d6d9fd8f.tar.gz tk-4a5e67634a03327c663552f5f742a3f5d6d9fd8f.tar.bz2 |
merge 8.5
FossilOrigin-Name: b72955ea5edead0e9140fa2e371dbdc7a7060c95
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tkTextDisp.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index 3edd5dc..bcbb03a 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -3931,30 +3931,6 @@ TkTextUpdateOneLine( * *---------------------------------------------------------------------- */ -#ifdef MAC_OSX_TK -static void -RedisplayText( - ClientData clientData ) -{ - register TkText *textPtr = (TkText *) clientData; - TextDInfo *dInfoPtr = textPtr->dInfoPtr; - TkRegion damageRegion; - XRectangle rectangle; - - if (dInfoPtr == NULL) { - return; - } - damageRegion = TkCreateRegion(); - rectangle.x = 0; - rectangle.y = 0; - rectangle.width = dInfoPtr->maxX; - rectangle.height = dInfoPtr->maxY; - TkUnionRectWithRegion(&rectangle, damageRegion, damageRegion); - - TextInvalidateRegion(textPtr, damageRegion); - DisplayText(clientData); -} -#endif static void DisplayText( @@ -3969,9 +3945,6 @@ DisplayText( int bottomY = 0; /* Initialization needed only to stop compiler * warnings. */ Tcl_Interp *interp; -#ifdef MAC_OSX_TK - Tcl_TimerToken macRefreshTimer = NULL; -#endif if ((textPtr->tkwin == NULL) || (textPtr->flags & DESTROYED)) { /* @@ -4165,21 +4138,6 @@ DisplayText( damageRgn)) { TextInvalidateRegion(textPtr, damageRgn); -#ifdef MAC_OSX_TK - - /* - * On OS X large scrolls sometimes leave garbage on the screen. - * This attempts to clean it up by redisplaying the Text window - * after 200 milliseconds. - */ - if ( abs(y-oldY) > 14 ) { - Tcl_DeleteTimerHandler(macRefreshTimer); - macRefreshTimer = Tcl_CreateTimerHandler(200, - RedisplayText, - clientData); - } -#endif - } numCopies++; TkDestroyRegion(damageRgn); |