diff options
| author | wolfsuit <wolfsuit> | 2004-02-16 00:42:33 (GMT) |
|---|---|---|
| committer | wolfsuit <wolfsuit> | 2004-02-16 00:42:33 (GMT) |
| commit | f81d6112d90d8b5299d8e2919768c7a9732bd086 (patch) | |
| tree | 12bebf3e6d48b35ab147bf17d2c87861606f8460 /macosx/tkMacOSXScale.c | |
| parent | 49243c32805b045b05c426b281ca7003ec6b9e50 (diff) | |
| download | tk-f81d6112d90d8b5299d8e2919768c7a9732bd086.zip tk-f81d6112d90d8b5299d8e2919768c7a9732bd086.tar.gz tk-f81d6112d90d8b5299d8e2919768c7a9732bd086.tar.bz2 | |
Backport Mac OS X specific fixes from TOT. See ChangeLog for details.
In tk_getOpenFile filters, handle the case where you have a Macintosh
file type and the files have no filetype.
Fix various formatting nits.
Diffstat (limited to 'macosx/tkMacOSXScale.c')
| -rw-r--r-- | macosx/tkMacOSXScale.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/macosx/tkMacOSXScale.c b/macosx/tkMacOSXScale.c index 3c00610..9022387 100644 --- a/macosx/tkMacOSXScale.c +++ b/macosx/tkMacOSXScale.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: tkMacOSXScale.c,v 1.2 2002/08/31 06:12:30 das Exp $ + * RCS: @(#) $Id: tkMacOSXScale.c,v 1.2.2.1 2004/02/16 00:42:34 wolfsuit Exp $ */ #include "tkScale.h" @@ -152,7 +152,7 @@ TkpDisplayScale(clientData) SInt16 maxValue; SInt16 procID; SInt32 controlReference; - Boolean initiallyVisible=true; + Boolean initiallyVisible = true; fprintf(stderr,"TkpDisplayScale\n"); scalePtr->flags &= ~REDRAW_PENDING; @@ -206,8 +206,8 @@ TkpDisplayScale(clientData) * Set up port for drawing Macintosh control. */ macDraw = (MacDrawable *) Tk_WindowId(tkwin); - destPort=TkMacOSXGetDrawablePort(Tk_WindowId(tkwin)); - windowRef=GetWindowFromPort(destPort); + destPort = TkMacOSXGetDrawablePort(Tk_WindowId(tkwin)); + windowRef = GetWindowFromPort(destPort); GetGWorld(&saveWorld, &saveDevice); SetGWorld(destPort, NULL); TkMacOSXSetUpClippingRgn(Tk_WindowId(tkwin)); @@ -217,16 +217,16 @@ TkpDisplayScale(clientData) */ if (macScalePtr->scaleHandle == NULL) { fprintf(stderr,"Initialising scale\n"); - r.left=macDraw->xOff; - r.top=macDraw->yOff; - r.right=macDraw->xOff+Tk_Width(tkwin) - scalePtr->inset; - r.bottom=macDraw->yOff+Tk_Height(tkwin) - scalePtr->inset; - - initialValue=scalePtr->value; - minValue=scalePtr->toValue; - maxValue=scalePtr->fromValue; - procID=kControlSliderProc; - controlReference=(SInt32) macScalePtr; + r.left = macDraw->xOff; + r.top = macDraw->yOff; + r.right = macDraw->xOff+Tk_Width(tkwin) - scalePtr->inset; + r.bottom = macDraw->yOff+Tk_Height(tkwin) - scalePtr->inset; + + initialValue = scalePtr->value; + minValue = scalePtr->toValue; + maxValue = scalePtr->fromValue; + procID = kControlSliderProc; + controlReference = (SInt32) macScalePtr; macScalePtr->scaleHandle = NewControl(windowRef, &r, "\p", initiallyVisible, initialValue,minValue,maxValue, procID, controlReference); @@ -234,7 +234,7 @@ TkpDisplayScale(clientData) /* * If we are foremost than make us active. */ - if (windowRef==FrontWindow()) { + if (windowRef == FrontWindow()) { macScalePtr->flags |= ACTIVE; } } |