diff options
| author | fvogel <fvogelnew1@free.fr> | 2016-01-11 13:23:20 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2016-01-11 13:23:20 (GMT) |
| commit | ddae56bbd0023f29a24d0529ed4fa0e3820ce7f2 (patch) | |
| tree | 87dfd77a94fb45488edde792e3b0735459a1fea7 /unix/tkUnixEmbed.c | |
| parent | 5c01788dc22a4a2f8e6d9e943dc61a5b73b28291 (diff) | |
| parent | 4a2efd946fe6674e460172920d097f7329d8e5d9 (diff) | |
| download | tk-ddae56bbd0023f29a24d0529ed4fa0e3820ce7f2.zip tk-ddae56bbd0023f29a24d0529ed4fa0e3820ce7f2.tar.gz tk-ddae56bbd0023f29a24d0529ed4fa0e3820ce7f2.tar.bz2 | |
merged trunk
Diffstat (limited to 'unix/tkUnixEmbed.c')
| -rw-r--r-- | unix/tkUnixEmbed.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/unix/tkUnixEmbed.c b/unix/tkUnixEmbed.c index 8a4c368..b170ad0 100644 --- a/unix/tkUnixEmbed.c +++ b/unix/tkUnixEmbed.c @@ -101,7 +101,7 @@ TkpUseWindow( { TkWindow *winPtr = (TkWindow *) tkwin; TkWindow *usePtr; - int id, anyError; + int anyError; Window parent; Tk_ErrorHandler handler; Container *containerPtr; @@ -115,10 +115,9 @@ TkpUseWindow( Tcl_SetErrorCode(interp, "TK", "EMBED", "POST_CREATE", NULL); return TCL_ERROR; } - if (Tcl_GetInt(interp, string, &id) != TCL_OK) { + if (TkpScanWindowId(interp, string, &parent) != TCL_OK) { return TCL_ERROR; } - parent = (Window) id; usePtr = (TkWindow *) Tk_IdToWindow(winPtr->display, parent); if (usePtr != NULL && !(usePtr->flags & TK_CONTAINER)) { @@ -867,8 +866,8 @@ int TkpTestembedCmd( ClientData clientData, /* Main window for application. */ Tcl_Interp *interp, /* Current interpreter. */ - int argc, /* Number of arguments. */ - const char **argv) /* Argument strings. */ + int objc, /* Number of arguments. */ + Tcl_Obj *const objv[]) /* Argument strings. */ { int all; Container *containerPtr; @@ -877,7 +876,7 @@ TkpTestembedCmd( ThreadSpecificData *tsdPtr = Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); - if ((argc > 1) && (strcmp(argv[1], "all") == 0)) { + if ((objc > 1) && (strcmp(Tcl_GetString(objv[1]), "all") == 0)) { all = 1; } else { all = 0; |