diff options
| author | das <das> | 2007-06-06 09:55:52 (GMT) |
|---|---|---|
| committer | das <das> | 2007-06-06 09:55:52 (GMT) |
| commit | adc0bc4faa9cf2596b856fd534befb42fab5d366 (patch) | |
| tree | 480bc4a2a26bcba12a790acc330f4781adc0e2e5 /macosx/tkMacOSXScale.c | |
| parent | 9f684a33310103c2c81b8afa31efbf646c5354ee (diff) | |
| download | tk-adc0bc4faa9cf2596b856fd534befb42fab5d366.zip tk-adc0bc4faa9cf2596b856fd534befb42fab5d366.tar.gz tk-adc0bc4faa9cf2596b856fd534befb42fab5d366.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.
* macosx/Wish.xcodeproj/project.pbxproj: add settings for Fix&Continue.
Diffstat (limited to 'macosx/tkMacOSXScale.c')
| -rw-r--r-- | macosx/tkMacOSXScale.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/macosx/tkMacOSXScale.c b/macosx/tkMacOSXScale.c index f0fca13..1efe10e 100644 --- a/macosx/tkMacOSXScale.c +++ b/macosx/tkMacOSXScale.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXScale.c,v 1.11 2007/04/23 21:24:34 das Exp $ + * RCS: @(#) $Id: tkMacOSXScale.c,v 1.12 2007/06/06 09:55:52 das Exp $ */ #include "tkMacOSXInt.h" @@ -267,11 +267,7 @@ TkpDisplayScale( &(macScalePtr->scaleHandle)); SetControlReference(macScalePtr->scaleHandle, (UInt32) scalePtr); - /* - * If we are foremost than make us active. - */ - - if (windowRef == FrontWindow()) { + if (IsWindowActive(windowRef)) { macScalePtr->flags |= ACTIVE; } } else { |