diff options
| -rw-r--r-- | macosx/tkMacOSXKeyEvent.c | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXScrlbr.c | 26 | ||||
| -rw-r--r-- | tests/font.test | 2 |
3 files changed, 14 insertions, 16 deletions
diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c index b6bd83c..ba885d1 100644 --- a/macosx/tkMacOSXKeyEvent.c +++ b/macosx/tkMacOSXKeyEvent.c @@ -244,8 +244,6 @@ unsigned short releaseCode; { int i, len = [(NSString *)aString length]; XEvent xEvent; - TkWindow *winPtr = TkMacOSXGetTkWindow([self window]); - Tk_Window tkwin = (Tk_Window) winPtr; if (NS_KEYLOG) NSLog (@"insertText '%@'\tlen = %d", aString, len); diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c index c4d74bb..079caae 100644 --- a/macosx/tkMacOSXScrlbr.c +++ b/macosx/tkMacOSXScrlbr.c @@ -213,13 +213,13 @@ TkpDisplayScrollbar( * None. * * Side effects: - * The scrollbar will be displayed differently. + * The scrollbar will be displayed differently. * *---------------------------------------------------------------------- */ - + extern void TkpComputeScrollbarGeometry( register TkScrollbar *scrollPtr) @@ -228,13 +228,13 @@ TkpComputeScrollbarGeometry( { /* - * Using code from tkUnixScrlbr.c because Unix scroll bindings are - * driving the display at the script level. All the Mac scrollbar - * has to do is re-draw itself. - */ - + * Using code from tkUnixScrlbr.c because Unix scroll bindings are + * driving the display at the script level. All the Mac scrollbar + * has to do is re-draw itself. + */ + int width, fieldLength; - + if (scrollPtr->highlightWidth < 0) { scrollPtr->highlightWidth = 0; } @@ -248,15 +248,15 @@ TkpComputeScrollbarGeometry( if (fieldLength < 0) { fieldLength = 0; } - scrollPtr->sliderFirst = fieldLength*scrollPtr->firstFraction; + scrollPtr->sliderFirst = fieldLength*scrollPtr->firstFraction; scrollPtr->sliderLast = fieldLength*scrollPtr->lastFraction; - + /* * Adjust the slider so that some piece of it is always displayed in the * scrollbar and so that it has at least a minimal width (so it can be * grabbed with the mouse). */ - + if (scrollPtr->sliderFirst > fieldLength - MIN_SLIDER_LENGTH) { scrollPtr->sliderFirst = fieldLength - MIN_SLIDER_LENGTH; } @@ -271,13 +271,13 @@ TkpComputeScrollbarGeometry( } scrollPtr->sliderFirst += scrollPtr->arrowLength + scrollPtr->inset; scrollPtr->sliderLast += scrollPtr->arrowLength + scrollPtr->inset; - + /* * Register the desired geometry for the window (leave enough space for * the two arrows plus a minimum-size slider, plus border around the whole * window, if any). Then arrange for the window to be redisplayed. */ - + if (scrollPtr->vertical) { Tk_GeometryRequest(scrollPtr->tkwin, scrollPtr->width + 2*scrollPtr->inset, diff --git a/tests/font.test b/tests/font.test index badfc4e..0c0681e 100644 --- a/tests/font.test +++ b/tests/font.test @@ -921,7 +921,7 @@ test font-21.5 {Tk_PostscriptFontName procedure: spaces} -constraints { } } -result {LucidaBright} test font-21.6 {Tk_PostscriptFontName procedure: spaces} -constraints { - x11 + x11 } -body { psfontname "{new century schoolbook} 10" } -result {NewCenturySchlbk-Roman} |