diff options
| author | das <das> | 2007-05-09 12:57:44 (GMT) |
|---|---|---|
| committer | das <das> | 2007-05-09 12:57:44 (GMT) |
| commit | f826ac6217b819d53876353acf2eb6688622564e (patch) | |
| tree | 1ea5714938378ea764c1925d778432b293d1173e /macosx/tkMacOSXSubwindows.c | |
| parent | c91f8973c04a4f3c48dd907359c7c98042e5d976 (diff) | |
| download | tk-f826ac6217b819d53876353acf2eb6688622564e.zip tk-f826ac6217b819d53876353acf2eb6688622564e.tar.gz tk-f826ac6217b819d53876353acf2eb6688622564e.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.
* 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/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 18dc2ec..564ad77 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.2.2.14 2007/04/29 02:26:50 das Exp $ + * RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.2.2.15 2007/05/09 12:57:47 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; } |