diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-07-28 07:25:21 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-07-28 07:25:21 (GMT) |
| commit | 77acd42d86b6416b8ee9420f6e9ff759f06c28ab (patch) | |
| tree | 9c609205cad73e977905800d4634bf3538071438 /unix | |
| parent | 42f0b713dd28f3d56226621b9016969cd5804a57 (diff) | |
| parent | cb9575f44e80a63234981233f4288fd29be862f8 (diff) | |
| download | tk-77acd42d86b6416b8ee9420f6e9ff759f06c28ab.zip tk-77acd42d86b6416b8ee9420f6e9ff759f06c28ab.tar.gz tk-77acd42d86b6416b8ee9420f6e9ff759f06c28ab.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/install-sh | 6 | ||||
| -rw-r--r-- | unix/tkUnixSend.c | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/unix/install-sh b/unix/install-sh index 5975819..7c34c3f 100644 --- a/unix/install-sh +++ b/unix/install-sh @@ -120,7 +120,7 @@ Options: -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. -s $stripprog installed files. - -S $stripprog installed files. + -S $stripprog installed files. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. @@ -156,8 +156,8 @@ while test $# -ne 0; do -s) stripcmd=$stripprog;; --S) stripcmd="$stripprog $2" - shift;; + -S) stripcmd="$stripprog $2" + shift;; -t) dst_arg=$2 shift;; diff --git a/unix/tkUnixSend.c b/unix/tkUnixSend.c index 3bd1c1b..e2d1e39 100644 --- a/unix/tkUnixSend.c +++ b/unix/tkUnixSend.c @@ -1353,11 +1353,8 @@ SendInit( * for it. */ - dispPtr->commTkwin = Tk_CreateWindow(interp, (Tk_Window) NULL, - "_comm", DisplayString(dispPtr->display)); - if (dispPtr->commTkwin == NULL) { - Tcl_Panic("Tk_CreateWindow failed in SendInit!"); - } + dispPtr->commTkwin = (Tk_Window) TkAllocWindow(dispPtr, + DefaultScreen(dispPtr->display), NULL); Tcl_Preserve(dispPtr->commTkwin); atts.override_redirect = True; Tk_ChangeWindowAttributes(dispPtr->commTkwin, |