diff options
| author | chengyemao <chengyemao@noemail.net> | 2005-01-09 00:22:47 (GMT) |
|---|---|---|
| committer | chengyemao <chengyemao@noemail.net> | 2005-01-09 00:22:47 (GMT) |
| commit | 0910f879887a76e9193d9da614d13fca71724a17 (patch) | |
| tree | 24980a63597070d37e5d66697e8242e41861d842 | |
| parent | b24f4031b0e5f04c15fa0743cc5718aa4e9338ef (diff) | |
| download | tk-0910f879887a76e9193d9da614d13fca71724a17.zip tk-0910f879887a76e9193d9da614d13fca71724a17.tar.gz tk-0910f879887a76e9193d9da614d13fca71724a17.tar.bz2 | |
Modified to keep consistent state of an embedded window
FossilOrigin-Name: e99a0adc13e1b6990207c634ada89cceb239182d
| -rw-r--r-- | win/tkWinWm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 7593863..1e875d2 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.88 2005/01/07 15:18:03 chengyemao Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.89 2005/01/09 00:22:48 chengyemao Exp $ */ #include "tkWinInt.h" @@ -2222,6 +2222,7 @@ UpdateWrapper(winPtr) |SWP_NOOWNERZORDER); } TkpWmSetState(winPtr, state); + wmPtr->hints.initial_state = state; if (hSmallIcon != NULL) { SendMessage(wmPtr->wrapper,WM_SETICON,ICON_SMALL,(LPARAM)hSmallIcon); @@ -2240,6 +2241,10 @@ UpdateWrapper(winPtr) */ if (winPtr->flags & TK_EMBEDDED) { + if(state != SendMessage(wmPtr->wrapper, TK_STATE, state, 0)) { + TkpWmSetState(winPtr, NormalState); + wmPtr->hints.initial_state = NormalState; + } XMapWindow(winPtr->display, winPtr->window); } |