summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Walzer <kw@codebykevin.com>2012-08-07 21:49:44 (GMT)
committerKevin Walzer <kw@codebykevin.com>2012-08-07 21:49:44 (GMT)
commit7f6dd547b889a03f46d5a84544f1c292e7881010 (patch)
tree9966d042b4089507179f69495dfbf7cc77a0777e
parent14cd8c272352eb6d51553f92ac67cf695304c56c (diff)
downloadtk-7f6dd547b889a03f46d5a84544f1c292e7881010.zip
tk-7f6dd547b889a03f46d5a84544f1c292e7881010.tar.gz
tk-7f6dd547b889a03f46d5a84544f1c292e7881010.tar.bz2
Fix regression in cutting/pasting text; thanks to Adrian Robert for patch
-rw-r--r--macosx/tkMacOSXEmbed.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c
index d6ce254..354a231 100644
--- a/macosx/tkMacOSXEmbed.c
+++ b/macosx/tkMacOSXEmbed.c
@@ -157,7 +157,7 @@ TkpMakeWindow(
macWin->xOff = 0;
macWin->yOff = 0;
macWin->toplevel = macWin;
- } else {
+ } else if (winPtr->parentPtr) {
macWin->xOff = winPtr->parentPtr->privatePtr->xOff +
winPtr->parentPtr->changes.border_width +
winPtr->changes.x;