Tk Source Code

Check-in [c53b4a0f]
Login
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2018 Conference, Houston/TX, US, Oct 15-19
Send your abstracts to tclconference@googlegroups.com
or submit via the online form by Aug 20.

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Remove warning on unused variable
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | mac-scrollbar-fix
Files: files | file ages | folders
SHA3-256:c53b4a0fe92d40eeb6684b978a0f4022708f8adce08ed7d7dda6adeaaa6c21b2
User & Date: kevin_walzer 2018-08-11 17:48:54
Context
2018-08-12
14:54
Merging fix for 1875c1f30f, a84b20edd check-in: 47959f6d user: kevin_walzer tags: trunk
14:54
Merging fix for 1875c1f30f, a84b20edd check-in: 26a029b4 user: kevin_walzer tags: core-8-6-branch
2018-08-11
17:48
Remove warning on unused variable Closed-Leaf check-in: c53b4a0f user: kevin_walzer tags: mac-scrollbar-fix
15:10
Minor tweak check-in: 970b9cf9 user: kevin_walzer tags: mac-scrollbar-fix
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to macosx/tkMacOSXScrlbr.c.

64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
...
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
...
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
    SInt32 width, minThumbHeight;
    int minHeight, topArrowHeight, bottomArrowHeight;
    NSControlSize controlSize;
} ScrollbarMetrics;


static ScrollbarMetrics metrics = {
    {15, 54, 26, 14, 14, kControlSizeNormal}, /* kThemeScrollBarMedium */
};

HIThemeTrackDrawInfo info = {
    .version = 0,
    .min = 0.0,
    .max = 100.0,
    .attributes = kThemeTrackShowThumb,
................................................................................
 extern void
TkpComputeScrollbarGeometry(
			    register TkScrollbar *scrollPtr)
/* Scrollbar whose geometry may have
 * changed. */
{

    int variant, fieldLength;

    if (scrollPtr->highlightWidth < 0) {
    	scrollPtr->highlightWidth = 0;
    }
    scrollPtr->inset = scrollPtr->highlightWidth + scrollPtr->borderWidth;
    scrollPtr->arrowLength = (metrics.topArrowHeight +
			      metrics.bottomArrowHeight) / 2;
................................................................................
UpdateControlValues(
		    TkScrollbar *scrollPtr)		/* Scrollbar data struct. */
{
    Tk_Window tkwin = scrollPtr->tkwin;
    MacDrawable *macWin = (MacDrawable *) Tk_WindowId(scrollPtr->tkwin);
    double dViewSize;
    HIRect  contrlRect;
    int variant;
    short width, height;

    NSView *view = TkMacOSXDrawableView(macWin);
    CGFloat viewHeight = [view bounds].size.height;
    NSRect frame;
    frame = NSMakeRect(macWin->xOff, macWin->yOff, Tk_Width(tkwin),
		       Tk_Height(tkwin));







|







 







|







 







<







64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
...
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
...
444
445
446
447
448
449
450

451
452
453
454
455
456
457
    SInt32 width, minThumbHeight;
    int minHeight, topArrowHeight, bottomArrowHeight;
    NSControlSize controlSize;
} ScrollbarMetrics;


static ScrollbarMetrics metrics = {
  {15, 54, 26, 14, 14, kControlSizeNormal}, /* kThemeScrollBarMedium */
};

HIThemeTrackDrawInfo info = {
    .version = 0,
    .min = 0.0,
    .max = 100.0,
    .attributes = kThemeTrackShowThumb,
................................................................................
 extern void
TkpComputeScrollbarGeometry(
			    register TkScrollbar *scrollPtr)
/* Scrollbar whose geometry may have
 * changed. */
{

    int fieldLength;

    if (scrollPtr->highlightWidth < 0) {
    	scrollPtr->highlightWidth = 0;
    }
    scrollPtr->inset = scrollPtr->highlightWidth + scrollPtr->borderWidth;
    scrollPtr->arrowLength = (metrics.topArrowHeight +
			      metrics.bottomArrowHeight) / 2;
................................................................................
UpdateControlValues(
		    TkScrollbar *scrollPtr)		/* Scrollbar data struct. */
{
    Tk_Window tkwin = scrollPtr->tkwin;
    MacDrawable *macWin = (MacDrawable *) Tk_WindowId(scrollPtr->tkwin);
    double dViewSize;
    HIRect  contrlRect;

    short width, height;

    NSView *view = TkMacOSXDrawableView(macWin);
    CGFloat viewHeight = [view bounds].size.height;
    NSRect frame;
    frame = NSMakeRect(macWin->xOff, macWin->yOff, Tk_Width(tkwin),
		       Tk_Height(tkwin));