diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-04-01 17:07:10 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-04-01 17:07:10 (GMT) |
| commit | 5a6fcb313c27b3145619f37e5d83b93586805a2e (patch) | |
| tree | 64da754277b242dc50862f735d5b4ee523971fa6 /win/tkWinWm.c | |
| parent | 9932e11bac14e2b538a97dbda667547a3e0b5dbc (diff) | |
| parent | a3be66c88fd7d5f2e2e9a475635bf0c5b407335b (diff) | |
| download | tk-5a6fcb313c27b3145619f37e5d83b93586805a2e.zip tk-5a6fcb313c27b3145619f37e5d83b93586805a2e.tar.gz tk-5a6fcb313c27b3145619f37e5d83b93586805a2e.tar.bz2 | |
Merge 8.5. Bring together the compile time and run time Xkb checks.
Diffstat (limited to 'win/tkWinWm.c')
| -rw-r--r-- | win/tkWinWm.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index e3816ca..9ea4957 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -5309,11 +5309,6 @@ WmStateCmd( return TCL_ERROR; } - if (Tcl_GetIndexFromObj(interp, objv[3], optionStrings, "argument", 0, - &index) != TCL_OK) { - return TCL_ERROR; - } - if (winPtr->flags & TK_EMBEDDED) { int state = 0; @@ -6590,7 +6585,7 @@ TkWmProtocolEventProc( Tcl_Preserve((ClientData) protPtr); interp = protPtr->interp; Tcl_Preserve((ClientData) interp); - result = Tcl_GlobalEval(interp, protPtr->command); + result = Tcl_EvalEx(interp, protPtr->command, -1, TCL_EVAL_GLOBAL); if (result != TCL_OK) { Tcl_AddErrorInfo(interp, "\n (command for \""); Tcl_AddErrorInfo(interp, name); |