diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-01 20:52:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-01 20:52:16 (GMT) |
| commit | 002540aedbd100ebc8a00e74568ea17c7f47673a (patch) | |
| tree | 5d9d87113e977fec4f8e1fa7709cec718a113caa /generic | |
| parent | f2ecf42d53b17282da36e109e89fe2acd1b55c2c (diff) | |
| parent | dc9e0b0355b022c0c543de5b166845fdf3242d0b (diff) | |
| download | tk-002540aedbd100ebc8a00e74568ea17c7f47673a.zip tk-002540aedbd100ebc8a00e74568ea17c7f47673a.tar.gz tk-002540aedbd100ebc8a00e74568ea17c7f47673a.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkImgPhInstance.c | 4 | ||||
| -rw-r--r-- | generic/tkTextDisp.c | 11 | ||||
| -rw-r--r-- | generic/ttk/ttkDefaultTheme.c | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/generic/tkImgPhInstance.c b/generic/tkImgPhInstance.c index cbf8222..12bdb7b 100644 --- a/generic/tkImgPhInstance.c +++ b/generic/tkImgPhInstance.c @@ -33,7 +33,7 @@ extern int _XInitImageFuncPtrs(XImage *image); * Forward declarations */ -#ifndef TKPUTIMAGE_CAN_BLEND +#ifndef TKPUTIMAGE_CAN_BLEND static void BlendComplexAlpha(XImage *bgImg, PhotoInstance *iPtr, int xOffset, int yOffset, int width, int height); #endif @@ -615,7 +615,7 @@ TkImgPhotoDisplay( #ifndef TKPUTIMAGE_CAN_BLEND XVisualInfo visInfo = instancePtr->visualInfo; #endif - + /* * If there's no pixmap, it means that an error occurred while creating * the image instance so it can't be displayed. diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index 5db96e8..1a31e93 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -213,7 +213,7 @@ typedef struct TextStyle { #define LOG(toVar,what) \ if (OK_TO_LOG) \ Tcl_SetVar2(textPtr->interp, toVar, NULL, (what), \ - TCL_GLOBAL_ONLY|TCL_APPEND_VALUE|TCL_LIST_ELEMENT) + TCL_GLOBAL_ONLY|TCL_APPEND_VALUE|TCL_LIST_ELEMENT) #define CLEAR(var) \ if (OK_TO_LOG) \ Tcl_SetVar2(interp, var, NULL, "", TCL_GLOBAL_ONLY) @@ -3135,11 +3135,11 @@ GenerateWidgetViewSyncEvent( * like a mouse click is received. But that extra drawing corrupts the * data that the test suite is trying to collect. */ - + if (!tkTextDebug) { FORCE_DISPLAY(textPtr->tkwin); } - + TkSendVirtualEvent(textPtr->tkwin, "WidgetViewSync", Tcl_NewBooleanObj(InSync)); } @@ -5261,7 +5261,7 @@ TkTextRelayoutWindow( AsyncUpdateLineMetrics, textPtr); inSync = 0; } - + if (!inSync) { GenerateWidgetViewSyncEvent(textPtr, 0); } @@ -6290,7 +6290,8 @@ TkTextPendingsync( TextDInfo *dInfoPtr = textPtr->dInfoPtr; return ( - ((dInfoPtr->metricEpoch == TCL_AUTO_LENGTH) && + (!(dInfoPtr->flags & REDRAW_PENDING) && + (dInfoPtr->metricEpoch == TCL_AUTO_LENGTH) && (dInfoPtr->lastMetricUpdateLine == dInfoPtr->currentMetricUpdateLine)) ? 0 : 1); } diff --git a/generic/ttk/ttkDefaultTheme.c b/generic/ttk/ttkDefaultTheme.c index fd08344..0b46db0 100644 --- a/generic/ttk/ttkDefaultTheme.c +++ b/generic/ttk/ttkDefaultTheme.c @@ -621,12 +621,12 @@ static void IndicatorElementDraw( * not use the Tk memory manager in its implementation of XDestroyImage, * even though that would be an extremely strange thing to do. */ - + #if defined(IGNORES_VISUAL) ckfree(img->data); img->data = NULL; #endif - + XDestroyImage(img); } |