diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-08-08 14:56:10 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-08-08 14:56:10 (GMT) |
| commit | 65d793b3be215f91dd1dbd6e39f56da7d5e54b5f (patch) | |
| tree | 9c79c32716d9d058341dd4c102a452fb7f38bfcc /macosx | |
| parent | 7a6f8e20bb79566f3c3150116fe642efad55c40d (diff) | |
| parent | 8eb53b086003e7868c9448417d74565ebd806ed2 (diff) | |
| download | tk-65d793b3be215f91dd1dbd6e39f56da7d5e54b5f.zip tk-65d793b3be215f91dd1dbd6e39f56da7d5e54b5f.tar.gz tk-65d793b3be215f91dd1dbd6e39f56da7d5e54b5f.tar.bz2 | |
merge trunk
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXEmbed.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c index a154e09..824a995 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; |