diff options
| author | das <das> | 2007-06-06 09:56:53 (GMT) |
|---|---|---|
| committer | das <das> | 2007-06-06 09:56:53 (GMT) |
| commit | ce5acb5ed756f94b279f428e363bb885ab971d01 (patch) | |
| tree | 0f31e25d4ca595727ac6e0b38a271fa4d9ad77bb /macosx/tkMacOSXScrlbr.c | |
| parent | 14f8f936349132e0f6dc66230d2378d47d0968d7 (diff) | |
| download | tk-ce5acb5ed756f94b279f428e363bb885ab971d01.zip tk-ce5acb5ed756f94b279f428e363bb885ab971d01.tar.gz tk-ce5acb5ed756f94b279f428e363bb885ab971d01.tar.bz2 | |
* macosx/tkMacOSXMouseEvent.c (GenerateMouseWheelEvent): enable
processing of mousewheel events in background windows.
* macosx/tkMacOSXScrlbr.c: modernize checks for active/front window.
* macosx/tkMacOSXScale.c:
* macosx/tkMacOSXWm.c:
* macosx/tkMacOSXColor.c: factor out verbose #ifdef checks of
* macosx/tkMacOSXDraw.c: MAC_OS_X_VERSION_{MAX_ALLOWED,MIN_REQUIRED}
* macosx/tkMacOSXEntry.c: and runtime checks of kHIToolboxVersion into
* macosx/tkMacOSXEvent.c: new TK_{IF,ELSE,ENDIF}_MAC_OS_X macros.
* macosx/tkMacOSXInit.c:
* macosx/tkMacOSXInt.h:
* macosx/tkMacOSXWm.c:
* macosx/tkMacOSXDraw.c: factor out clip clearing in QD ports;
* macosx/tkMacOSXEntry.c: formatting cleanup.
Diffstat (limited to 'macosx/tkMacOSXScrlbr.c')
| -rw-r--r-- | macosx/tkMacOSXScrlbr.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c index 4d2cb07..539f9f7 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.5.2.12 2007/05/09 12:57:46 das Exp $ + * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.5.2.13 2007/06/06 09:56:54 das Exp $ */ #include "tkMacOSXInt.h" @@ -274,7 +274,6 @@ TkpDisplayScrollbar( if (macScrollPtr->sbHandle == NULL) { Rect r = {0, 0, 1, 1}; - WindowRef frontNonFloating; windowRef = GetWindowFromPort(destPort); CreateScrollBarControl(windowRef, &r, MIN_SCROLLBAR_VALUE + @@ -283,13 +282,7 @@ TkpDisplayScrollbar( MIN_SCROLLBAR_VALUE, true, NULL, &(macScrollPtr->sbHandle)); SetControlReference(macScrollPtr->sbHandle, (SInt32) scrollPtr); - /* - * If we are foremost then make us active. - */ - - frontNonFloating = ActiveNonFloatingWindow(); - - if ((windowRef == FrontWindow()) || TkpIsWindowFloating(windowRef)) { + if (IsWindowActive(windowRef)) { macScrollPtr->macFlags |= ACTIVE; } } |