diff options
| author | hobbs <hobbs> | 1999-12-16 21:59:35 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 1999-12-16 21:59:35 (GMT) |
| commit | 3bbf2a103c03c7c5f318598f0f8df4576a4872db (patch) | |
| tree | 430ef5d08bf9e4fa76ad95f77476a11e1130e693 /win/tkWinWm.c | |
| parent | c9a242023cdce14e45cb94330e1800c7e864e4c2 (diff) | |
| download | tk-3bbf2a103c03c7c5f318598f0f8df4576a4872db.zip tk-3bbf2a103c03c7c5f318598f0f8df4576a4872db.tar.gz tk-3bbf2a103c03c7c5f318598f0f8df4576a4872db.tar.bz2 | |
* win/tkWinCursor.c: added support for Windows cursors to
TkGetCursorByName (.ani, .cur) using -cursor @<filename>
(Ascher) [Bug: 1350]
* win/tkWinWm.c: fixed 'wm deiconify' to update position of the
toplevel if event is waiting before mapping. (Mao) [Bug: 3687]
This removes the need for 'update idle' before 'wm deiconify' on
Windows.
Diffstat (limited to 'win/tkWinWm.c')
| -rw-r--r-- | win/tkWinWm.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 09f497a..9b60c25 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinWm.c,v 1.11 1999/09/21 06:43:06 hobbs Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.12 1999/12/16 21:59:35 hobbs Exp $ */ #include "tkWinInt.h" @@ -1389,6 +1389,17 @@ Tk_WmCmd(clientData, interp, argc, argv) ": it is an embedded window", (char *) NULL); return TCL_ERROR; } + /* + * If WM_UPDATE_PENDING is true, a pending UpdateGeometryInfo may + * need to be called first to update a withdrew toplevel's geometry + * before it is deiconified by TkpWmSetState. + * UpdateGeometryInfo has no effect on an iconified toplevel. + */ + if (wmPtr->flags & WM_UPDATE_PENDING) { + Tcl_CancelIdleCall(UpdateGeometryInfo, (ClientData) winPtr); + UpdateGeometryInfo((ClientData) winPtr); + } + TkpWmSetState(winPtr, NormalState); /* * Follow Windows-like style here: |