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 | 46d45df76056002dae01fa017aaa17478492ae52 (patch) | |
| tree | 9c79c32716d9d058341dd4c102a452fb7f38bfcc /macosx | |
| parent | a79f374eb7b87151782ae8a3fe0334225b1f8c50 (diff) | |
| parent | 7f6dd547b889a03f46d5a84544f1c292e7881010 (diff) | |
| download | tk-46d45df76056002dae01fa017aaa17478492ae52.zip tk-46d45df76056002dae01fa017aaa17478492ae52.tar.gz tk-46d45df76056002dae01fa017aaa17478492ae52.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; |