diff options
| author | wolfsuit <wolfsuit> | 2005-05-15 21:09:33 (GMT) |
|---|---|---|
| committer | wolfsuit <wolfsuit> | 2005-05-15 21:09:33 (GMT) |
| commit | 96fedba896a22af86c0a426b925575af8df35400 (patch) | |
| tree | 5aee3a7ffe9823811d0c9e4c8ce3fba437eb32ec /macosx/tkMacOSXScrlbr.c | |
| parent | d37684e3166d0c9986993a276e65a1572d103a01 (diff) | |
| download | tk-96fedba896a22af86c0a426b925575af8df35400.zip tk-96fedba896a22af86c0a426b925575af8df35400.tar.gz tk-96fedba896a22af86c0a426b925575af8df35400.tar.bz2 | |
Fixes from Michael Kirkham:
* macosx/tkMacOSXMenu.c (TkpConfigureMenuEntry): Thinko in clearing
the ENTRY_ACCEL_MASK before re-parsing it. [Tk Bug 1012852]
* macosx/tkMacOSXScrlbr.c (UpdateControlValues): Don't set the
control value BEFORE setting the min and max or the control manager
will reset it for you. [Tk Bug 1202181]
* macosx/tkMacOSXXStubs.c (TkMacOSXXGetPixel, TkMacOSXXPutPixel):
Restore the port to what it was before putting we were called.
[Tk Bug 1202223]
Diffstat (limited to 'macosx/tkMacOSXScrlbr.c')
| -rw-r--r-- | macosx/tkMacOSXScrlbr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c index 3746d7f..c6a8e29 100644 --- a/macosx/tkMacOSXScrlbr.c +++ b/macosx/tkMacOSXScrlbr.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: tkMacOSXScrlbr.c,v 1.11 2005/05/15 04:18:36 wolfsuit Exp $ + * RCS: @(#) $Id: tkMacOSXScrlbr.c,v 1.12 2005/05/15 21:09:34 wolfsuit Exp $ */ #include "tkScrollbar.h" @@ -1092,7 +1092,6 @@ UpdateControlValues( controlValue = (SInt32) (SCROLLBAR_SCALING_DVALUE * scrollPtr->firstFraction); SetControlViewSize(macScrollPtr->sbHandle,viewSize); - SetControl32BitValue(macScrollPtr->sbHandle, controlValue); SetControl32BitMaximum(macScrollPtr->sbHandle, controlMax); #if 0 @@ -1118,6 +1117,7 @@ UpdateControlValues( HiliteControl(macScrollPtr->sbHandle, 0); } } + SetControl32BitValue(macScrollPtr->sbHandle, controlValue); if ( !IsControlVisible (macScrollPtr -> sbHandle) ) { SetControlVisibility(macScrollPtr->sbHandle,TRUE,FALSE); |