diff options
| author | dgp <dgp@users.sourceforge.net> | 2011-06-10 20:14:39 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2011-06-10 20:14:39 (GMT) |
| commit | 4ce7fea0e868c2398b14bbf628d2194cd58dfb99 (patch) | |
| tree | aeffdde9ead5b6c4becdeee9212a8c316ebd3273 /win/tkWinDialog.c | |
| parent | 5fc40bc5fafeb6ab3d2d8f06618d5dabb72d89ed (diff) | |
| parent | 848c31f2245779ba4116b702a1dd27dbc3142ca5 (diff) | |
| download | tk-4ce7fea0e868c2398b14bbf628d2194cd58dfb99.zip tk-4ce7fea0e868c2398b14bbf628d2194cd58dfb99.tar.gz tk-4ce7fea0e868c2398b14bbf628d2194cd58dfb99.tar.bz2 | |
Merge to RC branch
Diffstat (limited to 'win/tkWinDialog.c')
| -rw-r--r-- | win/tkWinDialog.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index b4853bb..283667a 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -7,9 +7,6 @@ * * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. - * - * RCS: @(#) $Id: tkWinDialog.c,v 1.50.2.10 2010/11/24 15:11:36 nijtmans Exp $ - * */ #define WINVER 0x0500 /* Requires Windows 2K definitions */ @@ -2371,6 +2368,9 @@ Tk_MessageBoxObjCmd( } } + while (!Tk_IsTopLevel(parent)) { + parent = Tk_Parent(parent); + } Tk_MakeWindowExist(parent); hWnd = Tk_GetHWND(Tk_WindowId(parent)); @@ -2400,7 +2400,7 @@ Tk_MessageBoxObjCmd( flags = buttonFlagMap[defaultBtnIdx]; } - flags |= icon | type | MB_SYSTEMMODAL; + flags |= icon | type | MB_TASKMODAL | MB_SETFOREGROUND; tmpObj = messageObj ? Tcl_DuplicateObj(messageObj) : Tcl_NewUnicodeObj(NULL, 0); |