Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Backport of ::tk::mac::useCompatibilityMetrics handling and scrollbar metrics handling from trunk |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | core-8-5-branch |
Files: | files | file ages | folders |
SHA1: |
c4ddf09ae62d4df19162908fb846db80 |
User & Date: | jan.nijtmans 2012-10-23 07:39:03 |
Context
2012-10-23
| ||
08:52 | remove RCS keywords, use mode: objc consistantly check-in: 3554d988 user: jan.nijtmans tags: core-8-5-branch | |
07:39 | Backport of ::tk::mac::useCompatibilityMetrics handling and scrollbar metrics handling from trunk check-in: c4ddf09a user: jan.nijtmans tags: core-8-5-branch | |
2012-10-18
| ||
02:46 | Backport of dgp wm-forget and wm-manage fixes; test suite no longer crashes check-in: 336d7df9 user: kevin_walzer tags: core-8-5-branch | |
Changes
Changes to ChangeLog.
1 2 3 4 5 6 7 | 2012-10-09 Andreas Kupries <[email protected]> Cherrypick Merge, Backport of [6223d9e067]. Restored from tk-cocoa-8-5-bacport-branch, did not survive the merge. See trunk 2012-05-29 Donal K. Fellows * generic/tkInt.decls (TkMacOSXDrawable): Added OSX-specific mechanism | > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | 2012-10-23 Jan Nijtmans <[email protected]> * generic/tkButton.h: Backport of ::tk::mac::useCompatibilityMetrics * generic/tkButton.c handling and scrollbar metrics handling from trunk. * generic/tkScrollbar.h * generic/tkScrollbar.c * macosx/tkMacOSXButton.c * macosx/tkMacOSXScrlbr.c * unix/tkUnixPort.h * win/tkWinButton.c * win/tkWinScrlbr.c 2012-10-09 Andreas Kupries <[email protected]> Cherrypick Merge, Backport of [6223d9e067]. Restored from tk-cocoa-8-5-bacport-branch, did not survive the merge. See trunk 2012-05-29 Donal K. Fellows * generic/tkInt.decls (TkMacOSXDrawable): Added OSX-specific mechanism |
︙ | ︙ |
Changes to generic/tkButton.c.
︙ | ︙ | |||
51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | * It is used with the "enum compound" declaration in tkButton.h */ static const char *const compoundStrings[] = { "bottom", "center", "left", "none", "right", "top", NULL }; char tkDefButtonBorderWidth[TCL_INTEGER_SPACE] = DEF_BUTTON_BORDER_WIDTH; /* * Information used for parsing configuration options. There is a * separate table for each of the four widget classes. */ static const Tk_OptionSpec labelOptionSpecs[] = { | > > > > > > | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | * It is used with the "enum compound" declaration in tkButton.h */ static const char *const compoundStrings[] = { "bottom", "center", "left", "none", "right", "top", NULL }; char tkDefButtonHighlightWidth[TCL_INTEGER_SPACE] = DEF_BUTTON_HIGHLIGHT_WIDTH; char tkDefButtonPadx[TCL_INTEGER_SPACE] = DEF_BUTTON_PADX; char tkDefButtonPady[TCL_INTEGER_SPACE] = DEF_BUTTON_PADY; char tkDefButtonBorderWidth[TCL_INTEGER_SPACE] = DEF_BUTTON_BORDER_WIDTH; char tkDefLabelHighlightWidth[TCL_INTEGER_SPACE] = DEF_LABEL_HIGHLIGHT_WIDTH; char tkDefLabelPadx[TCL_INTEGER_SPACE] = DEF_LABCHKRAD_PADX; char tkDefLabelPady[TCL_INTEGER_SPACE] = DEF_LABCHKRAD_PADY; /* * Information used for parsing configuration options. There is a * separate table for each of the four widget classes. */ static const Tk_OptionSpec labelOptionSpecs[] = { |
︙ | ︙ | |||
106 107 108 109 110 111 112 | "HighlightBackground", DEF_BUTTON_HIGHLIGHT_BG_COLOR, -1, Tk_Offset(TkButton, highlightBorder), 0, (ClientData) DEF_BUTTON_HIGHLIGHT_BG_MONO, 0}, {TK_OPTION_COLOR, "-highlightcolor", "highlightColor", "HighlightColor", DEF_BUTTON_HIGHLIGHT, -1, Tk_Offset(TkButton, highlightColorPtr), 0, 0, 0}, {TK_OPTION_PIXELS, "-highlightthickness", "highlightThickness", | | | | | 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 | "HighlightBackground", DEF_BUTTON_HIGHLIGHT_BG_COLOR, -1, Tk_Offset(TkButton, highlightBorder), 0, (ClientData) DEF_BUTTON_HIGHLIGHT_BG_MONO, 0}, {TK_OPTION_COLOR, "-highlightcolor", "highlightColor", "HighlightColor", DEF_BUTTON_HIGHLIGHT, -1, Tk_Offset(TkButton, highlightColorPtr), 0, 0, 0}, {TK_OPTION_PIXELS, "-highlightthickness", "highlightThickness", "HighlightThickness", tkDefLabelHighlightWidth, Tk_Offset(TkButton, highlightWidthPtr), Tk_Offset(TkButton, highlightWidth), 0, 0, 0}, {TK_OPTION_STRING, "-image", "image", "Image", DEF_BUTTON_IMAGE, Tk_Offset(TkButton, imagePtr), -1, TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_JUSTIFY, "-justify", "justify", "Justify", DEF_BUTTON_JUSTIFY, -1, Tk_Offset(TkButton, justify), 0, 0, 0}, {TK_OPTION_PIXELS, "-padx", "padX", "Pad", tkDefLabelPadx, Tk_Offset(TkButton, padXPtr), Tk_Offset(TkButton, padX), 0, 0, 0}, {TK_OPTION_PIXELS, "-pady", "padY", "Pad", tkDefLabelPady, Tk_Offset(TkButton, padYPtr), Tk_Offset(TkButton, padY), 0, 0, 0}, {TK_OPTION_RELIEF, "-relief", "relief", "Relief", DEF_LABCHKRAD_RELIEF, -1, Tk_Offset(TkButton, relief), 0, 0, 0}, {TK_OPTION_STRING_TABLE, "-state", "state", "State", DEF_BUTTON_STATE, -1, Tk_Offset(TkButton, state), 0, (ClientData) stateStrings, 0}, {TK_OPTION_STRING, "-takefocus", "takeFocus", "TakeFocus", |
︙ | ︙ | |||
197 198 199 200 201 202 203 | "HighlightBackground", DEF_BUTTON_HIGHLIGHT_BG_COLOR, -1, Tk_Offset(TkButton, highlightBorder), 0, (ClientData) DEF_BUTTON_HIGHLIGHT_BG_MONO, 0}, {TK_OPTION_COLOR, "-highlightcolor", "highlightColor", "HighlightColor", DEF_BUTTON_HIGHLIGHT, -1, Tk_Offset(TkButton, highlightColorPtr), 0, 0, 0}, {TK_OPTION_PIXELS, "-highlightthickness", "highlightThickness", | | | | | 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 | "HighlightBackground", DEF_BUTTON_HIGHLIGHT_BG_COLOR, -1, Tk_Offset(TkButton, highlightBorder), 0, (ClientData) DEF_BUTTON_HIGHLIGHT_BG_MONO, 0}, {TK_OPTION_COLOR, "-highlightcolor", "highlightColor", "HighlightColor", DEF_BUTTON_HIGHLIGHT, -1, Tk_Offset(TkButton, highlightColorPtr), 0, 0, 0}, {TK_OPTION_PIXELS, "-highlightthickness", "highlightThickness", "HighlightThickness", tkDefButtonHighlightWidth, Tk_Offset(TkButton, highlightWidthPtr), Tk_Offset(TkButton, highlightWidth), 0, 0, 0}, {TK_OPTION_STRING, "-image", "image", "Image", DEF_BUTTON_IMAGE, Tk_Offset(TkButton, imagePtr), -1, TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_JUSTIFY, "-justify", "justify", "Justify", DEF_BUTTON_JUSTIFY, -1, Tk_Offset(TkButton, justify), 0, 0, 0}, {TK_OPTION_RELIEF, "-overrelief", "overRelief", "OverRelief", DEF_BUTTON_OVER_RELIEF, -1, Tk_Offset(TkButton, overRelief), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_PIXELS, "-padx", "padX", "Pad", tkDefButtonPadx, Tk_Offset(TkButton, padXPtr), Tk_Offset(TkButton, padX), 0, 0, 0}, {TK_OPTION_PIXELS, "-pady", "padY", "Pad", tkDefButtonPady, Tk_Offset(TkButton, padYPtr), Tk_Offset(TkButton, padY), 0, 0, 0}, {TK_OPTION_RELIEF, "-relief", "relief", "Relief", DEF_BUTTON_RELIEF, -1, Tk_Offset(TkButton, relief), 0, 0, 0}, {TK_OPTION_INT, "-repeatdelay", "repeatDelay", "RepeatDelay", DEF_BUTTON_REPEAT_DELAY, -1, Tk_Offset(TkButton, repeatDelay), 0, 0, 0}, |
︙ | ︙ | |||
295 296 297 298 299 300 301 | "HighlightBackground", DEF_BUTTON_HIGHLIGHT_BG_COLOR, -1, Tk_Offset(TkButton, highlightBorder), 0, (ClientData) DEF_BUTTON_HIGHLIGHT_BG_MONO, 0}, {TK_OPTION_COLOR, "-highlightcolor", "highlightColor", "HighlightColor", DEF_BUTTON_HIGHLIGHT, -1, Tk_Offset(TkButton, highlightColorPtr), 0, 0, 0}, {TK_OPTION_PIXELS, "-highlightthickness", "highlightThickness", | | | | | 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 | "HighlightBackground", DEF_BUTTON_HIGHLIGHT_BG_COLOR, -1, Tk_Offset(TkButton, highlightBorder), 0, (ClientData) DEF_BUTTON_HIGHLIGHT_BG_MONO, 0}, {TK_OPTION_COLOR, "-highlightcolor", "highlightColor", "HighlightColor", DEF_BUTTON_HIGHLIGHT, -1, Tk_Offset(TkButton, highlightColorPtr), 0, 0, 0}, {TK_OPTION_PIXELS, "-highlightthickness", "highlightThickness", "HighlightThickness", tkDefButtonHighlightWidth, Tk_Offset(TkButton, highlightWidthPtr), Tk_Offset(TkButton, highlightWidth), 0, 0, 0}, {TK_OPTION_STRING, "-image", "image", "Image", DEF_BUTTON_IMAGE, Tk_Offset(TkButton, imagePtr), -1, TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_BOOLEAN, "-indicatoron", "indicatorOn", "IndicatorOn", DEF_BUTTON_INDICATOR, -1, Tk_Offset(TkButton, indicatorOn), 0, 0, 0}, {TK_OPTION_JUSTIFY, "-justify", "justify", "Justify", DEF_BUTTON_JUSTIFY, -1, Tk_Offset(TkButton, justify), 0, 0, 0}, {TK_OPTION_RELIEF, "-offrelief", "offRelief", "OffRelief", DEF_BUTTON_RELIEF, -1, Tk_Offset(TkButton, offRelief), 0, 0, 0}, {TK_OPTION_STRING, "-offvalue", "offValue", "Value", DEF_BUTTON_OFF_VALUE, Tk_Offset(TkButton, offValuePtr), -1, 0, 0, 0}, {TK_OPTION_STRING, "-onvalue", "onValue", "Value", DEF_BUTTON_ON_VALUE, Tk_Offset(TkButton, onValuePtr), -1, 0, 0, 0}, {TK_OPTION_RELIEF, "-overrelief", "overRelief", "OverRelief", DEF_BUTTON_OVER_RELIEF, -1, Tk_Offset(TkButton, overRelief), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_PIXELS, "-padx", "padX", "Pad", tkDefLabelPadx, Tk_Offset(TkButton, padXPtr), Tk_Offset(TkButton, padX), 0, 0, 0}, {TK_OPTION_PIXELS, "-pady", "padY", "Pad", tkDefLabelPady, Tk_Offset(TkButton, padYPtr), Tk_Offset(TkButton, padY), 0, 0, 0}, {TK_OPTION_RELIEF, "-relief", "relief", "Relief", DEF_LABCHKRAD_RELIEF, -1, Tk_Offset(TkButton, relief), 0, 0, 0}, {TK_OPTION_BORDER, "-selectcolor", "selectColor", "Background", DEF_BUTTON_SELECT_COLOR, -1, Tk_Offset(TkButton, selectBorder), TK_OPTION_NULL_OK, (ClientData) DEF_BUTTON_SELECT_MONO, 0}, {TK_OPTION_STRING, "-selectimage", "selectImage", "SelectImage", |
︙ | ︙ | |||
408 409 410 411 412 413 414 | "HighlightBackground", DEF_BUTTON_HIGHLIGHT_BG_COLOR, -1, Tk_Offset(TkButton, highlightBorder), 0, (ClientData) DEF_BUTTON_HIGHLIGHT_BG_MONO, 0}, {TK_OPTION_COLOR, "-highlightcolor", "highlightColor", "HighlightColor", DEF_BUTTON_HIGHLIGHT, -1, Tk_Offset(TkButton, highlightColorPtr), 0, 0, 0}, {TK_OPTION_PIXELS, "-highlightthickness", "highlightThickness", | | | | | 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 | "HighlightBackground", DEF_BUTTON_HIGHLIGHT_BG_COLOR, -1, Tk_Offset(TkButton, highlightBorder), 0, (ClientData) DEF_BUTTON_HIGHLIGHT_BG_MONO, 0}, {TK_OPTION_COLOR, "-highlightcolor", "highlightColor", "HighlightColor", DEF_BUTTON_HIGHLIGHT, -1, Tk_Offset(TkButton, highlightColorPtr), 0, 0, 0}, {TK_OPTION_PIXELS, "-highlightthickness", "highlightThickness", "HighlightThickness", tkDefButtonHighlightWidth, Tk_Offset(TkButton, highlightWidthPtr), Tk_Offset(TkButton, highlightWidth), 0, 0, 0}, {TK_OPTION_STRING, "-image", "image", "Image", DEF_BUTTON_IMAGE, Tk_Offset(TkButton, imagePtr), -1, TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_BOOLEAN, "-indicatoron", "indicatorOn", "IndicatorOn", DEF_BUTTON_INDICATOR, -1, Tk_Offset(TkButton, indicatorOn), 0, 0, 0}, {TK_OPTION_JUSTIFY, "-justify", "justify", "Justify", DEF_BUTTON_JUSTIFY, -1, Tk_Offset(TkButton, justify), 0, 0, 0}, {TK_OPTION_RELIEF, "-offrelief", "offRelief", "OffRelief", DEF_BUTTON_RELIEF, -1, Tk_Offset(TkButton, offRelief), 0, 0, 0}, {TK_OPTION_RELIEF, "-overrelief", "overRelief", "OverRelief", DEF_BUTTON_OVER_RELIEF, -1, Tk_Offset(TkButton, overRelief), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_PIXELS, "-padx", "padX", "Pad", tkDefLabelPadx, Tk_Offset(TkButton, padXPtr), Tk_Offset(TkButton, padX), 0, 0, 0}, {TK_OPTION_PIXELS, "-pady", "padY", "Pad", tkDefLabelPady, Tk_Offset(TkButton, padYPtr), Tk_Offset(TkButton, padY), 0, 0, 0}, {TK_OPTION_RELIEF, "-relief", "relief", "Relief", DEF_LABCHKRAD_RELIEF, -1, Tk_Offset(TkButton, relief), 0, 0, 0}, {TK_OPTION_BORDER, "-selectcolor", "selectColor", "Background", DEF_BUTTON_SELECT_COLOR, -1, Tk_Offset(TkButton, selectBorder), TK_OPTION_NULL_OK, (ClientData) DEF_BUTTON_SELECT_MONO, 0}, {TK_OPTION_STRING, "-selectimage", "selectImage", "SelectImage", |
︙ | ︙ | |||
633 634 635 636 637 638 639 | TkButton *butPtr; Tk_OptionTable optionTable; Tk_Window tkwin; ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); if (!tsdPtr->defaultsInitialized) { | | | 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 | TkButton *butPtr; Tk_OptionTable optionTable; Tk_Window tkwin; ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); if (!tsdPtr->defaultsInitialized) { TkpButtonSetDefaults(); tsdPtr->defaultsInitialized = 1; } if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "pathName ?options?"); return TCL_ERROR; } |
︙ | ︙ |
Changes to generic/tkButton.h.
︙ | ︙ | |||
13 14 15 16 17 18 19 | #ifndef _TKBUTTON #define _TKBUTTON #ifndef _TKINT #include "tkInt.h" #endif | < < < < < | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | #ifndef _TKBUTTON #define _TKBUTTON #ifndef _TKINT #include "tkInt.h" #endif /* * Legal values for the "compound" field of TkButton records. */ enum compound { COMPOUND_BOTTOM, COMPOUND_CENTER, COMPOUND_LEFT, COMPOUND_NONE, COMPOUND_RIGHT, COMPOUND_TOP |
︙ | ︙ | |||
289 290 291 292 293 294 295 | #define REDRAW_PENDING (1 << 0) #define SELECTED (1 << 1) #define GOT_FOCUS (1 << 2) #define BUTTON_DELETED (1 << 3) #define TRISTATED (1 << 4) /* | | > > > > > > > | < < < | 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 | #define REDRAW_PENDING (1 << 0) #define SELECTED (1 << 1) #define GOT_FOCUS (1 << 2) #define BUTTON_DELETED (1 << 3) #define TRISTATED (1 << 4) /* * Declaration of button class functions structure * and button/label defaults, for use in optionSpecs. */ MODULE_SCOPE Tk_ClassProcs tkpButtonProcs; MODULE_SCOPE char tkDefButtonHighlightWidth[TCL_INTEGER_SPACE]; MODULE_SCOPE char tkDefButtonPadx[TCL_INTEGER_SPACE]; MODULE_SCOPE char tkDefButtonPady[TCL_INTEGER_SPACE]; MODULE_SCOPE char tkDefButtonBorderWidth[TCL_INTEGER_SPACE]; MODULE_SCOPE char tkDefLabelHighlightWidth[TCL_INTEGER_SPACE]; MODULE_SCOPE char tkDefLabelPadx[TCL_INTEGER_SPACE]; MODULE_SCOPE char tkDefLabelPady[TCL_INTEGER_SPACE]; /* * Declaration of functions used in the implementation of the button widget. */ #ifndef TkpButtonSetDefaults MODULE_SCOPE void TkpButtonSetDefaults(); #endif MODULE_SCOPE void TkButtonWorldChanged(ClientData instanceData); MODULE_SCOPE void TkpComputeButtonGeometry(TkButton *butPtr); MODULE_SCOPE TkButton *TkpCreateButton(Tk_Window tkwin); #ifndef TkpDestroyButton MODULE_SCOPE void TkpDestroyButton(TkButton *butPtr); #endif #ifndef TkpDisplayButton MODULE_SCOPE void TkpDisplayButton(ClientData clientData); #endif MODULE_SCOPE int TkInvokeButton(TkButton *butPtr); #endif /* _TKBUTTON */ |
Changes to generic/tkScrollbar.c.
︙ | ︙ | |||
22 23 24 25 26 27 28 29 30 31 32 | static Tk_CustomOption orientOption = { (Tk_OptionParseProc *) TkOrientParseProc, TkOrientPrintProc, (ClientData) NULL }; /* * Information used for argv parsing. */ | > > > | | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | static Tk_CustomOption orientOption = { (Tk_OptionParseProc *) TkOrientParseProc, TkOrientPrintProc, (ClientData) NULL }; /* non-const space for "-width" default value for scrollbars */ char tkDefScrollbarWidth[TCL_INTEGER_SPACE] = DEF_SCROLLBAR_WIDTH; /* * Information used for argv parsing. */ static Tk_ConfigSpec configSpecs[] = { {TK_CONFIG_BORDER, "-activebackground", "activeBackground", "Foreground", DEF_SCROLLBAR_ACTIVE_BG_COLOR, Tk_Offset(TkScrollbar, activeBorder), TK_CONFIG_COLOR_ONLY}, {TK_CONFIG_BORDER, "-activebackground", "activeBackground", "Foreground", DEF_SCROLLBAR_ACTIVE_BG_MONO, Tk_Offset(TkScrollbar, activeBorder), TK_CONFIG_MONO_ONLY}, {TK_CONFIG_RELIEF, "-activerelief", "activeRelief", "Relief", |
︙ | ︙ | |||
83 84 85 86 87 88 89 | {TK_CONFIG_COLOR, "-troughcolor", "troughColor", "Background", DEF_SCROLLBAR_TROUGH_COLOR, Tk_Offset(TkScrollbar, troughColorPtr), TK_CONFIG_COLOR_ONLY}, {TK_CONFIG_COLOR, "-troughcolor", "troughColor", "Background", DEF_SCROLLBAR_TROUGH_MONO, Tk_Offset(TkScrollbar, troughColorPtr), TK_CONFIG_MONO_ONLY}, {TK_CONFIG_PIXELS, "-width", "width", "Width", | | | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 | {TK_CONFIG_COLOR, "-troughcolor", "troughColor", "Background", DEF_SCROLLBAR_TROUGH_COLOR, Tk_Offset(TkScrollbar, troughColorPtr), TK_CONFIG_COLOR_ONLY}, {TK_CONFIG_COLOR, "-troughcolor", "troughColor", "Background", DEF_SCROLLBAR_TROUGH_MONO, Tk_Offset(TkScrollbar, troughColorPtr), TK_CONFIG_MONO_ONLY}, {TK_CONFIG_PIXELS, "-width", "width", "Width", tkDefScrollbarWidth, Tk_Offset(TkScrollbar, width), 0}, {TK_CONFIG_END, NULL, NULL, NULL, NULL, 0, 0} }; /* * Forward declarations for functions defined later in this file: */ |
︙ | ︙ | |||
277 278 279 280 281 282 283 | if (argc != 3) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], " cget option\"", NULL); goto error; } result = Tk_ConfigureValue(interp, scrollPtr->tkwin, | | | | | 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 | if (argc != 3) { Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], " cget option\"", NULL); goto error; } result = Tk_ConfigureValue(interp, scrollPtr->tkwin, configSpecs, (char *) scrollPtr, argv[2], 0); } else if ((c == 'c') && (strncmp(argv[1], "configure", length) == 0) && (length >= 2)) { if (argc == 2) { result = Tk_ConfigureInfo(interp, scrollPtr->tkwin, configSpecs, (char *) scrollPtr, NULL, 0); } else if (argc == 3) { result = Tk_ConfigureInfo(interp, scrollPtr->tkwin, configSpecs, (char *) scrollPtr, argv[2], 0); } else { result = ConfigureScrollbar(interp, scrollPtr, argc-2, argv+2, TK_CONFIG_ARGV_ONLY); } } else if ((c == 'd') && (strncmp(argv[1], "delta", length) == 0)) { int xDelta, yDelta, pixels, length; double fraction; |
︙ | ︙ | |||
525 526 527 528 529 530 531 | register TkScrollbar *scrollPtr, /* Information about widget; may or may not * already have values for some fields. */ int argc, /* Number of valid entries in argv. */ CONST char **argv, /* Arguments. */ int flags) /* Flags to pass to Tk_ConfigureWidget. */ { | | | 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 | register TkScrollbar *scrollPtr, /* Information about widget; may or may not * already have values for some fields. */ int argc, /* Number of valid entries in argv. */ CONST char **argv, /* Arguments. */ int flags) /* Flags to pass to Tk_ConfigureWidget. */ { if (Tk_ConfigureWidget(interp, scrollPtr->tkwin, configSpecs, argc, argv, (char *) scrollPtr, flags) != TCL_OK) { return TCL_ERROR; } /* * A few options need special processing, such as setting the background * from a 3-D border. |
︙ | ︙ | |||
600 601 602 603 604 605 606 | Tcl_CancelIdleCall(TkpDisplayScrollbar, (ClientData) scrollPtr); } /* * Free up all the stuff that requires special handling, then let * Tk_FreeOptions handle all the standard option-related stuff. */ | | | 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 | Tcl_CancelIdleCall(TkpDisplayScrollbar, (ClientData) scrollPtr); } /* * Free up all the stuff that requires special handling, then let * Tk_FreeOptions handle all the standard option-related stuff. */ Tk_FreeOptions(configSpecs, (char *) scrollPtr, scrollPtr->display, 0); Tcl_EventuallyFree((ClientData) scrollPtr, TCL_DYNAMIC); } else if (eventPtr->type == ConfigureNotify) { TkpComputeScrollbarGeometry(scrollPtr); TkScrollbarEventuallyRedraw(scrollPtr); } else if (eventPtr->type == FocusIn) { if (eventPtr->xfocus.detail != NotifyInferior) { |
︙ | ︙ |
Changes to generic/tkScrollbar.h.
︙ | ︙ | |||
13 14 15 16 17 18 19 | #ifndef _TKSCROLLBAR #define _TKSCROLLBAR #ifndef _TKINT #include "tkInt.h" #endif | < < < < < | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | #ifndef _TKSCROLLBAR #define _TKSCROLLBAR #ifndef _TKINT #include "tkInt.h" #endif /* * A data structure of the following type is kept for each scrollbar widget. */ typedef struct TkScrollbar { Tk_Window tkwin; /* Window that embodies the scrollbar. NULL * means that the window has been destroyed |
︙ | ︙ | |||
158 159 160 161 162 163 164 | */ #define REDRAW_PENDING 1 #define NEW_STYLE_COMMANDS 2 #define GOT_FOCUS 4 /* | | > | < < < < < < < < | 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 | */ #define REDRAW_PENDING 1 #define NEW_STYLE_COMMANDS 2 #define GOT_FOCUS 4 /* * Declaration of scrollbar class functions structure * and default scrollbar width, for use in configSpec. */ MODULE_SCOPE Tk_ClassProcs tkpScrollbarProcs; MODULE_SCOPE char tkDefScrollbarWidth[TCL_INTEGER_SPACE]; /* * Declaration of functions used in the implementation of the scrollbar * widget. */ MODULE_SCOPE void TkScrollbarEventProc(ClientData clientData, XEvent *eventPtr); MODULE_SCOPE void TkScrollbarEventuallyRedraw(TkScrollbar *scrollPtr); MODULE_SCOPE void TkpComputeScrollbarGeometry(TkScrollbar *scrollPtr); MODULE_SCOPE TkScrollbar *TkpCreateScrollbar(Tk_Window tkwin); MODULE_SCOPE void TkpDestroyScrollbar(TkScrollbar *scrollPtr); MODULE_SCOPE void TkpDisplayScrollbar(ClientData clientData); MODULE_SCOPE void TkpConfigureScrollbar(TkScrollbar *scrollPtr); MODULE_SCOPE int TkpScrollbarPosition(TkScrollbar *scrollPtr, int x, int y); #endif /* _TKSCROLLBAR */ |
Changes to macosx/tkMacOSXButton.c.
1 2 3 4 5 6 7 8 9 10 11 12 | /* * tkMacOSXButton.c -- * * This file implements the Macintosh specific portion of the * button widgets. * * Copyright (c) 1996-1997 by Sun Microsystems, Inc. * Copyright 2001-2009, Apple Inc. * Copyright (c) 2006-2009 Daniel A. Steffen <[email protected]> * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. | < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | /* * tkMacOSXButton.c -- * * This file implements the Macintosh specific portion of the * button widgets. * * Copyright (c) 1996-1997 by Sun Microsystems, Inc. * Copyright 2001-2009, Apple Inc. * Copyright (c) 2006-2009 Daniel A. Steffen <[email protected]> * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkMacOSXPrivate.h" #include "tkButton.h" #include "tkMacOSXFont.h" #include "tkMacOSXDebug.h" |
︙ | ︙ | |||
77 78 79 80 81 82 83 84 85 86 87 88 89 90 | /* * The class procedure table for the button widgets. */ Tk_ClassProcs tkpButtonProcs = { sizeof(Tk_ClassProcs), /* size */ TkButtonWorldChanged, /* worldChangedProc */ }; /* *---------------------------------------------------------------------- * * TkpCreateButton -- | > > | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | /* * The class procedure table for the button widgets. */ Tk_ClassProcs tkpButtonProcs = { sizeof(Tk_ClassProcs), /* size */ TkButtonWorldChanged, /* worldChangedProc */ NULL, /* createProc */ NULL /* modalProc */ }; /* *---------------------------------------------------------------------- * * TkpCreateButton -- |
︙ | ︙ | |||
241 242 243 244 245 246 247 | * Side effects: * Updates some of. * *---------------------------------------------------------------------- */ void | | < < < < < | | < | | < | | < < < < | 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 | * Side effects: * Updates some of. * *---------------------------------------------------------------------- */ void TkpButtonSetDefaults() { #if TK_MAC_BUTTON_USE_COMPATIBILITY_METRICS if (!tkMacOSXUseCompatibilityMetrics) { strcpy(tkDefButtonHighlightWidth, DEF_BUTTON_HIGHLIGHT_WIDTH_NOCM); strcpy(tkDefLabelHighlightWidth, DEF_BUTTON_HIGHLIGHT_WIDTH_NOCM); strcpy(tkDefButtonPadx, DEF_BUTTON_PADX_NOCM); strcpy(tkDefLabelPadx, DEF_BUTTON_PADX_NOCM); strcpy(tkDefButtonPady, DEF_BUTTON_PADY_NOCM); strcpy(tkDefLabelPady, DEF_BUTTON_PADY_NOCM); } #endif } #pragma mark - #pragma mark Native Buttons: |
︙ | ︙ | |||
584 585 586 587 588 589 590 | break; } } [button setImagePosition:pos]; } // if font is too tall, we can't use the fixed-height rounded bezel | | | | | | | | 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 | break; } } [button setImagePosition:pos]; } // if font is too tall, we can't use the fixed-height rounded bezel if (!haveImage && haveText && style == NSRoundedBezelStyle) { Tk_FontMetrics fm; Tk_GetFontMetrics(butPtr->tkfont, &fm); if (fm.linespace > 18) { [button setBezelStyle:(style = NSRegularSquareBezelStyle)]; } } bounds.size = [cell cellSize]; if (haveText) { titleRect = [cell titleRectForBounds:bounds]; if (butPtr->wrapLength > 0 && titleRect.size.width > butPtr->wrapLength) { |
︙ | ︙ | |||
668 669 670 671 672 673 674 | #ifdef TK_MAC_DEBUG_BUTTON TKLog(@"button %s bounds %@ titleRect %@ width %d height %d inset %d borderWidth %d", ((TkWindow *)butPtr->tkwin)->pathName, NSStringFromRect(bounds), NSStringFromRect(titleRect), width, height, butPtr->inset, butPtr->borderWidth); #endif } | < | 657 658 659 660 661 662 663 664 665 666 667 668 669 670 | #ifdef TK_MAC_DEBUG_BUTTON TKLog(@"button %s bounds %@ titleRect %@ width %d height %d inset %d borderWidth %d", ((TkWindow *)butPtr->tkwin)->pathName, NSStringFromRect(bounds), NSStringFromRect(titleRect), width, height, butPtr->inset, butPtr->borderWidth); #endif } #pragma mark - #pragma mark Unix Buttons: /* *---------------------------------------------------------------------- |
︙ | ︙ | |||
1179 1180 1181 1182 1183 1184 1185 | Tk_GeometryRequest(butPtr->tkwin, (int) (width + 2*butPtr->inset), (int) (height + 2*butPtr->inset)); Tk_SetInternalBorder(butPtr->tkwin, butPtr->inset); } /* * Local Variables: | | | 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 | Tk_GeometryRequest(butPtr->tkwin, (int) (width + 2*butPtr->inset), (int) (height + 2*butPtr->inset)); Tk_SetInternalBorder(butPtr->tkwin, butPtr->inset); } /* * Local Variables: * mode: objc * c-basic-offset: 4 * fill-column: 79 * coding: utf-8 * End: */ |
Changes to macosx/tkMacOSXScrlbr.c.
1 2 3 4 5 6 7 8 9 10 11 12 | /* * tkMacOSXScrollbar.c -- * * This file implements the Macintosh specific portion of the scrollbar * widget. * * Copyright (c) 1996 by Sun Microsystems, Inc. * Copyright 2001-2009, Apple Inc. * Copyright (c) 2006-2009 Daniel A. Steffen <[email protected]> * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. | < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | /* * tkMacOSXScrollbar.c -- * * This file implements the Macintosh specific portion of the scrollbar * widget. * * Copyright (c) 1996 by Sun Microsystems, Inc. * Copyright 2001-2009, Apple Inc. * Copyright (c) 2006-2009 Daniel A. Steffen <[email protected]> * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkMacOSXPrivate.h" #include "tkScrollbar.h" /* #ifdef TK_MAC_DEBUG |
︙ | ︙ | |||
40 41 42 43 44 45 46 | } ScrollbarMetrics; static ScrollbarMetrics metrics[2] = { {15, 54, 26, 14, 14, NSRegularControlSize}, /* kThemeScrollBarMedium */ {11, 40, 20, 10, 10, NSSmallControlSize}, /* kThemeScrollBarSmall */ }; | < < < < < < < | > > > | | > | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | } ScrollbarMetrics; static ScrollbarMetrics metrics[2] = { {15, 54, 26, 14, 14, NSRegularControlSize}, /* kThemeScrollBarMedium */ {11, 40, 20, 10, 10, NSSmallControlSize}, /* kThemeScrollBarSmall */ }; /* * Declarations for functions defined in this file. */ static void UpdateScrollbarMetrics(void); static void ScrollbarEventProc(ClientData clientData, XEvent *eventPtr); /* * The class procedure table for the scrollbar widget. */ Tk_ClassProcs tkpScrollbarProcs = { sizeof(Tk_ClassProcs), /* size */ NULL, /* worldChangedProc */ NULL, /* createProc */ NULL /* modalProc */ }; #pragma mark TKApplication(TKScrlbr) #define NSAppleAquaScrollBarVariantChanged @"AppleAquaScrollBarVariantChanged" @implementation TKApplication(TKScrlbr) - (void) tkScroller: (NSScroller *) scroller { NSScrollerPart hitPart = [scroller hitPart]; TkScrollbar *scrollPtr = (TkScrollbar *)[scroller tag]; Tcl_DString cmdString; Tcl_Interp *interp; int result; if (!scrollPtr || !scrollPtr->command || !scrollPtr->commandSize || |
︙ | ︙ | |||
127 128 129 130 131 132 133 | Tcl_DStringFree(&cmdString); #ifdef TK_MAC_DEBUG_SCROLLBAR TKLog(@"scroller %s value %f knobProportion %f", ((TkWindow *)scrollPtr->tkwin)->pathName, [scroller doubleValue], [scroller knobProportion]); #endif } | > | > > | > > | 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 | Tcl_DStringFree(&cmdString); #ifdef TK_MAC_DEBUG_SCROLLBAR TKLog(@"scroller %s value %f knobProportion %f", ((TkWindow *)scrollPtr->tkwin)->pathName, [scroller doubleValue], [scroller knobProportion]); #endif } - (void) scrollBarVariantChanged: (NSNotification *) notification { #ifdef TK_MAC_DEBUG_NOTIFICATIONS TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification); #endif UpdateScrollbarMetrics(); } - (void) _setupScrollBarNotifications { NSNotificationCenter *nc = [NSNotificationCenter defaultCenter]; #define observe(n, s) [nc addObserver:self selector:@selector(s) name:(n) object:nil] observe(NSAppleAquaScrollBarVariantChanged, scrollBarVariantChanged:); #undef observe UpdateScrollbarMetrics(); } @end |
︙ | ︙ | |||
176 177 178 179 180 181 182 | .max = 1, .value = 0, .attributes = kThemeTrackShowThumb, .enableState = kThemeTrackActive, .trackInfo.scrollbar = {.viewsize = 1, .pressState = 0}, }; CGRect bounds; | < | 176 177 178 179 180 181 182 183 184 185 186 187 188 189 | .max = 1, .value = 0, .attributes = kThemeTrackShowThumb, .enableState = kThemeTrackActive, .trackInfo.scrollbar = {.viewsize = 1, .pressState = 0}, }; CGRect bounds; ChkErr(GetThemeMetric, kThemeMetricScrollBarWidth, &metrics[0].width); ChkErr(GetThemeMetric, kThemeMetricScrollBarMinThumbHeight, &metrics[0].minThumbHeight); info.kind = kThemeScrollBarMedium; ChkErr(HIThemeGetTrackDragRect, &info, &bounds); metrics[0].topArrowHeight = bounds.origin.y; |
︙ | ︙ | |||
199 200 201 202 203 204 205 | ChkErr(HIThemeGetTrackDragRect, &info, &bounds); metrics[1].topArrowHeight = bounds.origin.y; metrics[1].bottomArrowHeight = height - (bounds.origin.y + bounds.size.height); metrics[1].minHeight = metrics[1].minThumbHeight + metrics[1].topArrowHeight + metrics[1].bottomArrowHeight; | | < < < < < < | 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 | ChkErr(HIThemeGetTrackDragRect, &info, &bounds); metrics[1].topArrowHeight = bounds.origin.y; metrics[1].bottomArrowHeight = height - (bounds.origin.y + bounds.size.height); metrics[1].minHeight = metrics[1].minThumbHeight + metrics[1].topArrowHeight + metrics[1].bottomArrowHeight; sprintf(tkDefScrollbarWidth, "%d", (int)(metrics[0].width)); } /* *---------------------------------------------------------------------- * * TkpCreateScrollbar -- * |
︙ | ︙ | |||
231 232 233 234 235 236 237 | TkScrollbar * TkpCreateScrollbar( Tk_Window tkwin) { MacScrollbar *scrollPtr = (MacScrollbar *) ckalloc(sizeof(MacScrollbar)); scrollPtr->scroller = nil; | < | < | < | 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 | TkScrollbar * TkpCreateScrollbar( Tk_Window tkwin) { MacScrollbar *scrollPtr = (MacScrollbar *) ckalloc(sizeof(MacScrollbar)); scrollPtr->scroller = nil; Tk_CreateEventHandler(tkwin, StructureNotifyMask|FocusChangeMask| ActivateMask|ExposureMask, ScrollbarEventProc, (ClientData) scrollPtr); return (TkScrollbar *) scrollPtr; } /* *---------------------------------------------------------------------- * * TkpDestroyScrollbar -- |
︙ | ︙ | |||
270 271 272 273 274 275 276 | /* *-------------------------------------------------------------- * * TkpDisplayScrollbar -- * * This procedure redraws the contents of a scrollbar window. It is | | | | 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | /* *-------------------------------------------------------------- * * TkpDisplayScrollbar -- * * This procedure redraws the contents of a scrollbar window. It is * invoked as a do-when-idle handler, so it only runs when there's nothing * else for the application to do. * * Results: * None. * * Side effects: * Information appears on the screen. * |
︙ | ︙ | |||
334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 | if ([scroller superview] != view) { [view addSubview:scroller]; } frame = NSMakeRect(macWin->xOff, macWin->yOff, Tk_Width(tkwin), Tk_Height(tkwin)); frame = NSInsetRect(frame, scrollPtr->inset, scrollPtr->inset); frame.origin.y = viewHeight - (frame.origin.y + frame.size.height); NSWindow *w = [view window]; if ([w showsResizeIndicator]) { NSRect growBox = [view convertRect:[w _growBoxRect] fromView:nil]; if (NSIntersectsRect(growBox, frame)) { if (scrollPtr->vertical) { CGFloat y = frame.origin.y; frame.origin.y = growBox.origin.y + growBox.size.height; frame.size.height -= frame.origin.y - y; } else { frame.size.width = growBox.origin.x - frame.origin.x; } TkMacOSXSetScrollbarGrow(winPtr, true); } | > > > > | 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 | if ([scroller superview] != view) { [view addSubview:scroller]; } frame = NSMakeRect(macWin->xOff, macWin->yOff, Tk_Width(tkwin), Tk_Height(tkwin)); frame = NSInsetRect(frame, scrollPtr->inset, scrollPtr->inset); frame.origin.y = viewHeight - (frame.origin.y + frame.size.height); NSWindow *w = [view window]; if ([w showsResizeIndicator]) { NSRect growBox = [view convertRect:[w _growBoxRect] fromView:nil]; if (NSIntersectsRect(growBox, frame)) { if (scrollPtr->vertical) { CGFloat y = frame.origin.y; frame.origin.y = growBox.origin.y + growBox.size.height; frame.size.height -= frame.origin.y - y; } else { frame.size.width = growBox.origin.x - frame.origin.x; } TkMacOSXSetScrollbarGrow(winPtr, true); } |
︙ | ︙ | |||
404 405 406 407 408 409 410 411 | width = Tk_Width(scrollPtr->tkwin) - 2 * scrollPtr->inset; height = Tk_Height(scrollPtr->tkwin) - 2 * scrollPtr->inset; variant = ((scrollPtr->vertical ? width : height) < metrics[0].width) ? 1 : 0; macScrollPtr->variant = variant; if (scroller) { NSSize size = [scroller frame].size; if ((size.width > size.height) ^ !scrollPtr->vertical) { | > > | > > | 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 | width = Tk_Width(scrollPtr->tkwin) - 2 * scrollPtr->inset; height = Tk_Height(scrollPtr->tkwin) - 2 * scrollPtr->inset; variant = ((scrollPtr->vertical ? width : height) < metrics[0].width) ? 1 : 0; macScrollPtr->variant = variant; if (scroller) { NSSize size = [scroller frame].size; if ((size.width > size.height) ^ !scrollPtr->vertical) { /* * Orientation changed, need new scroller. */ if ([scroller superview]) { [scroller removeFromSuperviewWithoutNeedingDisplay]; } TkMacOSXMakeCollectableAndRelease(scroller); } } if (!scroller) { |
︙ | ︙ | |||
610 611 612 613 614 615 616 | default: TkScrollbarEventProc(clientData, eventPtr); } } /* * Local Variables: | | | 608 609 610 611 612 613 614 615 616 617 618 619 620 | default: TkScrollbarEventProc(clientData, eventPtr); } } /* * Local Variables: * mode: objc * c-basic-offset: 4 * fill-column: 79 * coding: utf-8 * End: */ |
Changes to unix/tkUnixPort.h.
︙ | ︙ | |||
180 181 182 183 184 185 186 | */ /* * These functions do nothing under Unix, so we just eliminate calls to them. */ | | | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 | */ /* * These functions do nothing under Unix, so we just eliminate calls to them. */ #define TkpButtonSetDefaults() {} #define TkpDestroyButton(butPtr) {} #define TkSelUpdateClipboard(a,b) {} #ifndef __CYGWIN__ #define TkSetPixmapColormap(p,c) {} #endif /* |
︙ | ︙ |
Changes to win/tkWinButton.c.
︙ | ︙ | |||
86 87 88 89 90 91 92 | * The class procedure table for the button widgets. */ Tk_ClassProcs tkpButtonProcs = { sizeof(Tk_ClassProcs), /* size */ TkButtonWorldChanged, /* worldChangedProc */ CreateProc, /* createProc */ | | | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 | * The class procedure table for the button widgets. */ Tk_ClassProcs tkpButtonProcs = { sizeof(Tk_ClassProcs), /* size */ TkButtonWorldChanged, /* worldChangedProc */ CreateProc, /* createProc */ NULL /* modalProc */ }; /* *---------------------------------------------------------------------- * * InitBoxes -- |
︙ | ︙ | |||
177 178 179 180 181 182 183 | * Side effects: * Updates some of. * *---------------------------------------------------------------------- */ void | | < < < | 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 | * Side effects: * Updates some of. * *---------------------------------------------------------------------- */ void TkpButtonSetDefaults() { int width = GetSystemMetrics(SM_CXEDGE); if (width > 0) { sprintf(tkDefButtonBorderWidth, "%d", width); } } |
︙ | ︙ |
Changes to win/tkWinScrlbr.c.
︙ | ︙ | |||
48 49 50 51 52 53 54 | /* * Cached system metrics used to determine scrollbar geometry. */ static int initialized = 0; static int hArrowWidth, hThumb; /* Horizontal control metrics. */ | | < < < < < < < | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | /* * Cached system metrics used to determine scrollbar geometry. */ static int initialized = 0; static int hArrowWidth, hThumb; /* Horizontal control metrics. */ static int vArrowHeight, vThumb; /* Vertical control metrics. */ TCL_DECLARE_MUTEX(winScrlbrMutex) /* * Declarations for functions defined in this file. */ static Window CreateProc(Tk_Window tkwin, Window parent, ClientData instanceData); static void ModalLoopProc(Tk_Window tkwin, XEvent *eventPtr); |
︙ | ︙ | |||
357 358 359 360 361 362 363 | * *---------------------------------------------------------------------- */ void UpdateScrollbarMetrics(void) { | | < | < < < < < < | 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 | * *---------------------------------------------------------------------- */ void UpdateScrollbarMetrics(void) { int arrowWidth = GetSystemMetrics(SM_CXVSCROLL); hArrowWidth = GetSystemMetrics(SM_CXHSCROLL); hThumb = GetSystemMetrics(SM_CXHTHUMB); vArrowHeight = GetSystemMetrics(SM_CYVSCROLL); vThumb = GetSystemMetrics(SM_CYVTHUMB); sprintf(tkDefScrollbarWidth, "%d", arrowWidth); } /* *---------------------------------------------------------------------- * * TkpComputeScrollbarGeometry -- * |
︙ | ︙ |