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/tkMacOSXScrlbr.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/tkMacOSXScrlbr.c')
| -rw-r--r-- | macosx/tkMacOSXScrlbr.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c index 48d153a..8e1148e 100644 --- a/macosx/tkMacOSXScrlbr.c +++ b/macosx/tkMacOSXScrlbr.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.21 2007/04/23 21:24:34 das Exp $ + * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.22 2007/05/09 12:55:16 das Exp $ */ #include "tkMacOSXInt.h" @@ -846,7 +846,9 @@ ScrollbarBindProc( * Workaround for Carbon bug where the scrollbar down arrow * sometimes gets "stuck" after the mousebutton has been released. */ - TkMacOSXSetUpClippingRgn(Tk_WindowId(scrollPtr->tkwin)); + if (scrollPtr->tkwin) { + TkMacOSXSetUpClippingRgn(Tk_WindowId(scrollPtr->tkwin)); + } Draw1Control(macScrollPtr->sbHandle); } TkMacOSXTrackingLoop(0); @@ -855,8 +857,11 @@ ScrollbarBindProc( * The HandleControlClick call will "eat" the ButtonUp event. We now * generate a ButtonUp event so Tk will unset implicit grabs etc. */ - window = Tk_WindowId(scrollPtr->tkwin); - TkGenerateButtonEventForXPointer(window); + + if (scrollPtr->tkwin) { + window = Tk_WindowId(scrollPtr->tkwin); + TkGenerateButtonEventForXPointer(window); + } if (portChanged) { QDSwapPort(savePort, NULL); |