summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root>2012-07-23 22:53:30 (GMT)
committerroot <root>2012-07-23 22:53:30 (GMT)
commitc315d3e456e6fe5c0abc226702265e84c68dac35 (patch)
tree16da99640cc5e50fca19e6bd42e61c929a083ccb
parented71824f826f7e40c9d3478e1b81d49955232692 (diff)
downloadtk-c315d3e456e6fe5c0abc226702265e84c68dac35.zip
tk-c315d3e456e6fe5c0abc226702265e84c68dac35.tar.gz
tk-c315d3e456e6fe5c0abc226702265e84c68dac35.tar.bz2
Fix for [Bug 3546073]:
Replace Tk_CreateWindow(... DisplayString(dispPtr->display)) with direct call to TkAllocWindow().
-rw-r--r--generic/tkClipboard.c7
-rw-r--r--unix/tkUnixSend.c7
2 files changed, 4 insertions, 10 deletions
diff --git a/generic/tkClipboard.c b/generic/tkClipboard.c
index 9428894..168171b 100644
--- a/generic/tkClipboard.c
+++ b/generic/tkClipboard.c
@@ -645,11 +645,8 @@ TkClipInit(
* and set up an event handler for it.
*/
- dispPtr->clipWindow = Tk_CreateWindow(interp, (Tk_Window) NULL,
- "_clip", DisplayString(dispPtr->display));
- if (dispPtr->clipWindow == NULL) {
- return TCL_ERROR;
- }
+ dispPtr->clipWindow = TkAllocWindow(dispPtr,
+ DefaultScreen(dispPtr->display), NULL);
Tcl_Preserve((ClientData) dispPtr->clipWindow);
atts.override_redirect = True;
Tk_ChangeWindowAttributes(dispPtr->clipWindow, CWOverrideRedirect, &atts);
diff --git a/unix/tkUnixSend.c b/unix/tkUnixSend.c
index c073309..493100e 100644
--- a/unix/tkUnixSend.c
+++ b/unix/tkUnixSend.c
@@ -1350,11 +1350,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 = TkAllocWindow(dispPtr,
+ DefaultScreen(dispPtr->display), NULL);
Tcl_Preserve((ClientData) dispPtr->commTkwin);
atts.override_redirect = True;
Tk_ChangeWindowAttributes(dispPtr->commTkwin,