summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-08-18 13:31:40 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-08-18 13:31:40 (GMT)
commitf5a19bad1b4fb331592ba16f41e4f1122dc891bb (patch)
tree60715ab7c0a98b9acd52e730d2b74ef399c2de9a /generic
parenta0186aabaef33d8ba53ef9d250707fc00995c98c (diff)
parent4ccf614e946e9d871b37e6cd562a038f687e8d7a (diff)
downloadtk-f5a19bad1b4fb331592ba16f41e4f1122dc891bb.zip
tk-f5a19bad1b4fb331592ba16f41e4f1122dc891bb.tar.gz
tk-f5a19bad1b4fb331592ba16f41e4f1122dc891bb.tar.bz2
merge 8.5
Diffstat (limited to 'generic')
-rw-r--r--generic/tkTextDisp.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 2516e1c..cd232bf 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -3968,6 +3968,16 @@ 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