summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorculler <culler>2020-07-23 15:22:33 (GMT)
committerculler <culler>2020-07-23 15:22:33 (GMT)
commit7da497b576c4b2fa5bf3660f84e6984d55b376f1 (patch)
tree74ebfee7fda34eb5adebf2ad00e4e95d35816916
parente9fb55d44123ed3f5db96f308e4143e6efa22205 (diff)
downloadtk-7da497b576c4b2fa5bf3660f84e6984d55b376f1.zip
tk-7da497b576c4b2fa5bf3660f84e6984d55b376f1.tar.gz
tk-7da497b576c4b2fa5bf3660f84e6984d55b376f1.tar.bz2
The added event loops work to update the mapped flags for packed and placed windows, but they break more than they fix.
-rw-r--r--macosx/tkMacOSXSubwindows.c2
-rw-r--r--macosx/tkMacOSXWindowEvent.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 030830d..8bae8fd 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -206,7 +206,6 @@ XMapWindow(
event.xmap.event = window;
event.xmap.override_redirect = winPtr->atts.override_redirect;
Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
- while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_WINDOW_EVENTS|TCL_DONT_WAIT)) {}
} else {
/*
@@ -317,7 +316,6 @@ XUnmapWindow(
event.xunmap.event = window;
event.xunmap.from_configure = false;
Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
- while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_WINDOW_EVENTS|TCL_DONT_WAIT)) {}
} else {
/*
* Rebuild the visRgn clip region for the parent so it will be allowed
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 3f0e52f..5f52ea7 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -117,7 +117,8 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
* Process all Tk events generated by Tk_MapWindow().
*/
- while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_WINDOW_EVENTS|TCL_DONT_WAIT)) {}
+ while (Tcl_ServiceEvent(0)) {}
+ while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
/*
* NSWindowDidDeminiaturizeNotification is received after