diff options
| author | das <das> | 2007-05-09 12:55:15 (GMT) |
|---|---|---|
| committer | das <das> | 2007-05-09 12:55:15 (GMT) |
| commit | c0e4ec8c452c01a8d95608e922f8bd3657c10ccb (patch) | |
| tree | 506fdf03b09705deab71a428fb32dc8204a24c92 /macosx/tkMacOSXSubwindows.c | |
| parent | b7ca14476921fec908be93647b91fe3947b5f824 (diff) | |
| download | tk-c0e4ec8c452c01a8d95608e922f8bd3657c10ccb.zip tk-c0e4ec8c452c01a8d95608e922f8bd3657c10ccb.tar.gz tk-c0e4ec8c452c01a8d95608e922f8bd3657c10ccb.tar.bz2 | |
* macosx/tkMacOSXWindowEvent.c: ensure window is brought to the front
* macosx/tkMacOSXMouseEvent.c: at the start of a window drag (except
* macosx/tkMacOSXInt.h: when cmd key is down); formatting and
whitespace fixes.
* macosx/tkMacOSXDialog.c (Tk_GetSaveFileObjCmd): add -filetypes option
processing (fixes fileDialog-0.1, fileDialog-0.2 failures).
* macosx/tkMacOSXEmbed.c (TkpMakeWindow, TkpUseWindow): fix sending of
Visibility event for embedded windows (fixes frame-3.9 hang).
* macosx/tkMacOSXScrlbr.c (ScrollbarBindProc): fix testsuite
* macosx/tkMacOSXSubwindows.c (TkMacOSXUpdateClipRgn): crashes by
adding sanity checks.
* macosx/Wish.xcodeproj/project.pbxproj: add 'DebugUnthreaded' &
* macosx/Wish.xcodeproj/default.pbxuser: 'DebugLeaks' targets and env
var settings needed to run the 'leaks' tool.
* macosx/tkMacOSXButton.c: fix debug msg typo.
Diffstat (limited to 'macosx/tkMacOSXSubwindows.c')
| -rw-r--r-- | macosx/tkMacOSXSubwindows.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c index 377e528..f909800 100644 --- a/macosx/tkMacOSXSubwindows.c +++ b/macosx/tkMacOSXSubwindows.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.17 2007/04/23 21:24:34 das Exp $ + * RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.18 2007/05/09 12:55:16 das Exp $ */ #include "tkMacOSXInt.h" @@ -844,8 +844,10 @@ TkMacOSXUpdateClipRgn( if (!Tk_IsTopLevel(winPtr)) { TkMacOSXUpdateClipRgn(winPtr->parentPtr); TkMacOSXCheckTmpRgnEmpty(1); - SectRgn(rgn, - winPtr->parentPtr->privatePtr->aboveClipRgn, rgn); + if (winPtr->parentPtr) { + SectRgn(rgn, + winPtr->parentPtr->privatePtr->aboveClipRgn, rgn); + } win2Ptr = winPtr->nextPtr; while (win2Ptr != NULL) { @@ -1115,7 +1117,7 @@ TkMacOSXGetDrawablePort( * of the time, this is harmless... However, we really need to * find why the embedding loses. */ - DebugStr("\pTkMacOSXGetDrawablePort couldn't find container"); + TkMacOSXDbgMsg("Couldn't find container"); return NULL; } |