diff options
| author | fvogel <fvogelnew1@free.fr> | 2015-02-05 21:50:48 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2015-02-05 21:50:48 (GMT) |
| commit | cd43dc5d400d4646a76dfdb37a555d7c8d6bda6b (patch) | |
| tree | 21cd3bd5e8429f4f5e3c39e8f6a8f92908fb032c /generic | |
| parent | 8f78c04f27c6531c1dd122dfeded9c377aa6b494 (diff) | |
| parent | bedea5a5c74e0fb7f66c572836dc4d98a3285147 (diff) | |
| download | tk-cd43dc5d400d4646a76dfdb37a555d7c8d6bda6b.zip tk-cd43dc5d400d4646a76dfdb37a555d7c8d6bda6b.tar.gz tk-cd43dc5d400d4646a76dfdb37a555d7c8d6bda6b.tar.bz2 | |
Merged core-8-5-branch
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkFont.c | 2 | ||||
| -rw-r--r-- | generic/tkTextDisp.c | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c index 9eaaf94..5d2ad43 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -3015,7 +3015,6 @@ ConfigAttributesObj( for (i = 0; i < objc; i += 2) { optionPtr = objv[i]; - valuePtr = objv[i + 1]; if (Tcl_GetIndexFromObj(interp, optionPtr, fontOpt, "option", 1, &index) != TCL_OK) { @@ -3034,6 +3033,7 @@ ConfigAttributesObj( } return TCL_ERROR; } + valuePtr = objv[i + 1]; switch (index) { case FONT_FAMILY: diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index e21b76b..49a35f5 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -4034,16 +4034,6 @@ DisplayText( UpdateDisplayInfo(textPtr); dInfoPtr->dLinesInvalidated = 0; -#ifdef MAC_OSX_TK - /* - * Make sure that unmapped subwindows really have been unmapped. - * If the unmap request is pending as an idle request, the window - * can get redrawn on top of the widget. - */ - while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_DONT_WAIT)) {} -#endif - - /* * See if it's possible to bring some parts of the screen up-to-date by * scrolling (copying from other parts of the screen). We have to be |