diff options
| author | hobbs <hobbs@noemail.net> | 1999-09-21 06:42:16 (GMT) |
|---|---|---|
| committer | hobbs <hobbs@noemail.net> | 1999-09-21 06:42:16 (GMT) |
| commit | e464cf5bfa8d424f7588e8da20e67849e6f670e9 (patch) | |
| tree | cbe860d1508f98a6d812f3f3090568a2d2f0bdbe /win/tkWinWm.c | |
| parent | cd0c91b2a04e965e5f3ac9b01b5f9f6828baf156 (diff) | |
| download | tk-e464cf5bfa8d424f7588e8da20e67849e6f670e9.zip tk-e464cf5bfa8d424f7588e8da20e67849e6f670e9.tar.gz tk-e464cf5bfa8d424f7588e8da20e67849e6f670e9.tar.bz2 | |
1999-09-16 Jeff Hobbs <hobbs@scriptics.com>
* generic/tkFont.c: fixed processing of font options and error
returned [Bug: 2075]
* win/tkWinWm.c: fixed bug in 'wm deiconify' that raised the
wrong toplevel, and changed it to not set focus on overridden
toplevels
1999-09-15 Jeff Hobbs <hobbs@scriptics.com>
* unix/aclocal.m4: added fix for FreeBSD-[1-2] recognition [Bug: 2070]
and fix to AIX-* to get ldAix right [Bug: 2624], fixed AIX
version check (readjust from 8-21 fix) and several other config
fixes for AIX
* mac/tkMacMenubutton.c:
* unix/tkUnixMenubu.c: fixed permanently stippled menubutton image
* win/tkWinButton.c: fixed possible pointer smash [Bug: 2733]
1999-09-14 Jeff Hobbs <hobbs@scriptics.com>
* win/tkWinMenu.c: fix for stack overrun in GetTextFace [Bug: 909]
FossilOrigin-Name: 8b23a0f7f176faa57f568a25735ed084b2666a90
Diffstat (limited to 'win/tkWinWm.c')
| -rw-r--r-- | win/tkWinWm.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 822735e..09f497a 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.10 1999/08/10 16:58:52 hobbs Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.11 1999/09/21 06:43:06 hobbs Exp $ */ #include "tkWinInt.h" @@ -1392,10 +1392,13 @@ Tk_WmCmd(clientData, interp, argc, argv) TkpWmSetState(winPtr, NormalState); /* * Follow Windows-like style here: - * raise the window to the top and force the focus on it + * raise the window to the top, and if it isn't overridden, + * then force the focus on it */ - Tk_RestackWindow(tkwin, Above, NULL); - TkSetFocusWin(winPtr, 1); + TkWmRestackToplevel(winPtr, Above, NULL); + if (!(Tk_Attributes((Tk_Window) winPtr)->override_redirect)) { + TkSetFocusWin(winPtr, 1); + } } else if ((c == 'f') && (strncmp(argv[1], "focusmodel", length) == 0) && (length >= 2)) { if ((argc != 3) && (argc != 4)) { |