Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | add tk upstream changes |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
ac417d65fd430a095aa87486754e50e3 |
User & Date: | chw 2019-07-16 04:55:34.315 |
Context
2019-07-16
| ||
04:57 | in undroid/vanillawish build scripts set macosx min version to 10.10 check-in: 476b7c5f60 user: chw tags: trunk | |
04:55 | add tk upstream changes check-in: ac417d65fd user: chw tags: trunk | |
2019-07-13
| ||
20:55 | better error handling w.r.t. check-in [f125b3dc59] check-in: 4dcaf5f047 user: chw tags: trunk | |
Changes
Changes to jni/sdl2tk/library/demos/twind.tcl.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | + + + + + + + + | # twind.tcl -- # # This demonstration script creates a text widget with a bunch of # embedded windows. if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." } package require Tk # Make an Aqua button's fill color match its parent's background proc blend {bt} { if {[tk windowingsystem] eq "aqua"} { $bt configure -highlightbackground [[winfo parent $bt] cget -background] } return $bt } set w .twind catch {destroy $w} toplevel $w wm title $w "Text Demonstration - Embedded Windows and Other Features" wm iconname $w "Embedded Windows" positionWindow $w |
︙ | |||
49 50 51 52 53 54 55 | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 | - + - + - + + + - + + - + + - + + | $t insert end "scrolling in all directions is provided.\n\n" $t insert end "A text widget can contain other widgets embedded " $t insert end "it. These are called \"embedded windows\", " $t insert end "and they can consist of arbitrary widgets. " $t insert end "For example, here are two embedded button " $t insert end "widgets. You can click on the first button to " |
︙ | |||
124 125 126 127 128 129 130 | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 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 | - - + + - + - - - - - - + + + + + + | $t window create end -window $t.toggle -padx 3 -pady 2 set i 1 foreach color {AntiqueWhite3 Bisque1 Bisque2 Bisque3 Bisque4 SlateBlue3 RoyalBlue1 SteelBlue2 DeepSkyBlue3 LightBlue1 DarkSlateGray1 Aquamarine2 DarkSeaGreen2 SeaGreen1 Yellow1 IndianRed1 IndianRed2 Tan1 Tan4} { button $t.color$i -text $color -cursor top_left_arrow -command \ |
︙ | |||
184 185 186 187 188 189 190 | 197 198 199 200 201 202 203 204 205 206 207 208 209 210 | - | proc textWindSmallH w { $w configure -highlightthickness $::text_normal(highlight) } proc textWindSmallP w { $w configure -padx $::text_normal(pad) -pady $::text_normal(pad) } |
︙ | |||
285 286 287 288 289 290 291 292 293 | 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 323 324 325 | + + + + + + + + + + + - + + | $t delete $t.c while {[string first [$t get plot] " \t\n"] >= 0} { $t delete plot } $t insert plot " " } } proc changeBg {t c} { $t configure -background $c if {[tk windowingsystem] eq "aqua"} { foreach b [$t window names] { if {[winfo class $b] eq "Button"} { $b configure -highlightbackground $c } } } } proc embDefBg t { |
︙ |
Changes to jni/sdl2tk/macosx/tkMacOSXDefault.h.
︙ | |||
31 32 33 34 35 36 37 | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | - + + - + | * TROUGH - Background color for troughs in scales and scrollbars. * INDICATOR - Color for indicator when button is selected. * DISABLED - Foreground color when widget is disabled. */ #define BLACK "Black" #define WHITE "White" |
︙ | |||
167 168 169 170 171 172 173 | 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 | - + | */ #define MAC_OSX_FOCUS_WIDTH 3 #define MAC_OSX_ENTRY_BORDER 2 #define MAC_OSX_ENTRY_RELIEF TK_RELIEF_SUNKEN #define MAC_OSX_ENTRY_SELECT_RELIEF TK_RELIEF_FLAT |
︙ | |||
244 245 246 247 248 249 250 | 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 | - + | #define DEF_LABELFRAME_LABELANCHOR "nw" /* * Defaults for listboxes: */ #define DEF_LISTBOX_ACTIVE_STYLE "dotbox" |
︙ | |||
497 498 499 500 501 502 503 | 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 | - + | #define DEF_SCROLLBAR_WIDTH "15" /* * Defaults for texts: */ #define DEF_TEXT_AUTO_SEPARATORS "1" |
︙ |