Merge trunk

23 files changed, 423 insertions, 242 deletions

diff --git a/library/bgerror.tcl b/library/bgerror.tcl
index fa095f3..8421924 100644
--- a/library/bgerror.tcl
+++ b/library/bgerror.tcl
@@ -115,6 +115,7 @@ proc ::tk::dialog::error::bgerror {err {flag 1}} {
     set windowingsystem [tk windowingsystem]
     if {$windowingsystem eq "aqua"} {
 	if $flag {
+	    set errorInfo $info
 	    after 500 [list bgerror "$err" 0]
 	    return
 	}
diff --git a/library/demos/arrow.tcl b/library/demos/arrow.tcl
index 5011f6f..12249c0 100644
--- a/library/demos/arrow.tcl
+++ b/library/demos/arrow.tcl
@@ -135,9 +135,13 @@ set demo_arrowInfo(y) 150
 set demo_arrowInfo(smallTips) {5 5 2}
 set demo_arrowInfo(count) 0
 if {[winfo depth $c] > 1} {
-    set demo_arrowInfo(bigLineStyle) "-fill SkyBlue1"
-    set demo_arrowInfo(boxStyle) "-fill {} -outline black -width 1"
-    set demo_arrowInfo(activeStyle) "-fill red -outline black -width 1"
+    if {[tk windowingsystem] eq "aqua"} {
+	set demo_arrowInfo(bigLineStyle) "-fill systemSelectedTextBackgroundColor"
+    } else {
+	set demo_arrowInfo(bigLineStyle) "-fill LightSeaGreen"
+    }
+    set demo_arrowInfo(boxStyle) "-fill {} -width 1"
+    set demo_arrowInfo(activeStyle) "-fill red -width 1"
 } else {
     # Main widget program sets variable tk_demoDirectory
     set demo_arrowInfo(bigLineStyle) "-fill black \
diff --git a/library/demos/cscroll.tcl b/library/demos/cscroll.tcl
index 570a35b..f534d99 100644
--- a/library/demos/cscroll.tcl
+++ b/library/demos/cscroll.tcl
@@ -47,7 +47,7 @@ for {set i 0} {$i < 20} {incr i} {
     set x [expr {-10 + 3*$i}]
     for {set j 0; set y -10} {$j < 10} {incr j; incr y 3} {
 	$c create rect ${x}c ${y}c [expr {$x+2}]c [expr {$y+2}]c \
-		-outline black -fill $bg -tags rect
+		-fill $bg -tags rect
 	$c create text [expr {$x+1}]c [expr {$y+1}]c -text "$i,$j" \
 	    -anchor center -tags text
     }
@@ -72,11 +72,25 @@ if {[tk windowingsystem] eq "aqua"} {
 	%W xview scroll [expr {-10 * (%D)}] units
     }
 } else {
+    # We must make sure that positive and negative movements are rounded
+    # equally to integers, avoiding the problem that
+    #     (int)1/30 = 0,
+    # but
+    #     (int)-1/30 = -1
+    # The following code ensure equal +/- behaviour.
     bind $c <MouseWheel> {
-	%W yview scroll [expr {-(%D / 30)}] units
+	if {%D >= 0} {
+	    %W yview scroll [expr {-%D/30}] units
+	} else {
+	    %W yview scroll [expr {(29-%D)/30}] units
+	}
     }
     bind $c <Shift-MouseWheel> {
-	%W xview scroll [expr {-(%D / 30)}] units
+	if {%D >= 0} {
+	    %W xview scroll [expr {-%D/30}] units
+	} else {
+	    %W xview scroll [expr {(29-%D)/30}] units
+	}
     }
 }
 
@@ -128,10 +142,11 @@ proc scrollEnter canvas {
     }
     set oldFill [lindex [$canvas itemconfig $id -fill] 4]
     if {[winfo depth $canvas] > 1} {
-	$canvas itemconfigure $id -fill SeaGreen1
-    } else {
-	$canvas itemconfigure $id -fill black
-	$canvas itemconfigure [expr {$id+1}] -fill white
+	if {[tk windowingsystem] eq "aqua"} {
+	    $canvas itemconfigure $id -fill systemSelectedTextBackgroundColor
+	} else {
+	    $canvas itemconfigure $id -fill LightSeaGreen
+	}
     }
 }
 
@@ -142,11 +157,9 @@ proc scrollLeave canvas {
 	set id [expr {$id-1}]
     }
     $canvas itemconfigure $id -fill $oldFill
-    $canvas itemconfigure [expr {$id+1}] -fill black
 }
 
 proc scrollButton canvas {
-    global oldFill
     set id [$canvas find withtag current]
     if {[lsearch [$canvas gettags current] text] < 0} {
 	set id [expr {$id+1}]
diff --git a/library/demos/floor.tcl b/library/demos/floor.tcl
index c36979b..d5ef3a0 100644
--- a/library/demos/floor.tcl
+++ b/library/demos/floor.tcl
@@ -99,7 +99,7 @@ proc roomChanged {w args} {
     }
     set new [eval \
 	"$w create polygon [$w coords $item] -fill $colors(active) \
-	-tags highlight"]
+	-outline {} -tags highlight"]
     $w raise $new marker
 }
 
@@ -114,7 +114,7 @@ proc roomChanged {w args} {
 # outline -	Color to use for the floor's outline.
 
 proc bg1 {w fill outline} {
-    $w create poly 347 80 349 82 351 84 353 85 363 92 375 99 386 104 \
+    $w create polygon 347 80 349 82 351 84 353 85 363 92 375 99 386 104 \
 	386 129 398 129 398 162 484 162 484 129 559 129 559 133 725 \
 	133 725 129 802 129 802 389 644 389 644 391 559 391 559 327 \
 	508 327 508 311 484 311 484 278 395 278 395 288 400 288 404 \
@@ -127,7 +127,7 @@ proc bg1 {w fill outline} {
 	22 223 17 227 13 231 8 236 4 242 2 246 0 260 0 283 1 300 5 \
 	321 14 335 22 348 25 365 29 363 39 358 48 352 56 337 70 \
 	344 76 347 80 \
-	-tags {floor1 bg} -fill $fill
+	-tags {floor1 bg} -fill $fill -outline {}
     $w create line 386 129 398 129 -fill $outline -tags {floor1 bg}
     $w create line 258 355 258 387 -fill $outline -tags {floor1 bg}
     $w create line 60 387 60 391 -fill $outline -tags {floor1 bg}
@@ -239,12 +239,12 @@ proc bg1 {w fill outline} {
 # outline -	Color to use for the floor's outline.
 
 proc bg2 {w fill outline} {
-    $w create poly 559 129 484 129 484 162 398 162 398 129 315 129 \
+    $w create polygon 559 129 484 129 484 162 398 162 398 129 315 129 \
 	315 133 176 133 176 129 96 129 96 133 3 133 3 339 0 339 0 391 \
 	60 391 60 387 258 387 258 329 350 329 350 311 395 311 395 280 \
 	484 280 484 311 508 311 508 327 558 327 558 391 644 391 644 \
 	367 802 367 802 129 725 129 725 133 559 133 559 129 \
-	-tags {floor2 bg} -fill $fill
+	-tags {floor2 bg} -fill $fill -outline {}
     $w create line 350 311 350 329 -fill $outline -tags {floor2 bg}
     $w create line 398 129 398 162 -fill $outline -tags {floor2 bg}
     $w create line 802 367 802 129 -fill $outline -tags {floor2 bg}
@@ -294,12 +294,12 @@ proc bg2 {w fill outline} {
 # outline -	Color to use for the floor's outline.
 
 proc bg3 {w fill outline} {
-    $w create poly 159 300 107 300 107 248 159 248 159 129 96 129 96 \
+    $w create polygon 159 300 107 300 107 248 159 248 159 129 96 129 96 \
 	133 21 133 21 331 0 331 0 391 60 391 60 370 159 370 159 300 \
-	-tags {floor3 bg} -fill $fill
-    $w create poly 258 370 258 329 350 329 350 311 399 311 399 129 \
+	-tags {floor3 bg} -fill $fill -outline {}
+    $w create polygon 258 370 258 329 350 329 350 311 399 311 399 129 \
 	315 129 315 133 176 133 176 129 159 129 159 370 258 370 \
-	-tags {floor3 bg} -fill $fill
+	-tags {floor3 bg} -fill $fill -outline {}
     $w create line 96 133 96 129 -fill $outline -tags {floor3 bg}
     $w create line 176 129 96 129 -fill $outline -tags {floor3 bg}
     $w create line 176 129 176 133 -fill $outline -tags {floor3 bg}
@@ -333,195 +333,195 @@ proc bg3 {w fill outline} {
 
 proc fg1 {w color} {
     global floorLabels floorItems
-    set i [$w create polygon 375 246 375 172 341 172 341 246 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 375 246 375 172 341 172 341 246 -outline {} -tags {floor1 room}]
     set floorLabels($i) 101
     set {floorItems(101)} $i
     $w create text 358 209 -text 101 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 307 240 339 240 339 206 307 206 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 307 240 339 240 339 206 307 206 -outline {} -tags {floor1 room}]
     set floorLabels($i) {Pub Lift1}
     set {floorItems(Pub Lift1)} $i
     $w create text 323 223 -text {Pub Lift1} -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 339 205 307 205 307 171 339 171 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 339 205 307 205 307 171 339 171 -outline {} -tags {floor1 room}]
     set floorLabels($i) {Priv Lift1}
     set {floorItems(Priv Lift1)} $i
     $w create text 323 188 -text {Priv Lift1} -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 42 389 42 337 1 337 1 389 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 42 389 42 337 1 337 1 389 -outline {} -tags {floor1 room}]
     set floorLabels($i) 110
     set {floorItems(110)} $i
     $w create text 21.5 363 -text 110 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 59 389 59 385 90 385 90 337 44 337 44 389 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 59 389 59 385 90 385 90 337 44 337 44 389 -outline {} -tags {floor1 room}]
     set floorLabels($i) 109
     set {floorItems(109)} $i
     $w create text 67 363 -text 109 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 51 300 51 253 6 253 6 300 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 51 300 51 253 6 253 6 300 -outline {} -tags {floor1 room}]
     set floorLabels($i) 111
     set {floorItems(111)} $i
     $w create text 28.5 276.5 -text 111 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 98 248 98 309 79 309 79 248 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 98 248 98 309 79 309 79 248 -outline {} -tags {floor1 room}]
     set floorLabels($i) 117B
     set {floorItems(117B)} $i
     $w create text 88.5 278.5 -text 117B -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 51 251 51 204 6 204 6 251 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 51 251 51 204 6 204 6 251 -outline {} -tags {floor1 room}]
     set floorLabels($i) 112
     set {floorItems(112)} $i
     $w create text 28.5 227.5 -text 112 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 6 156 51 156 51 203 6 203 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 6 156 51 156 51 203 6 203 -outline {} -tags {floor1 room}]
     set floorLabels($i) 113
     set {floorItems(113)} $i
     $w create text 28.5 179.5 -text 113 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 85 169 79 169 79 192 85 192 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 85 169 79 169 79 192 85 192 -outline {} -tags {floor1 room}]
     set floorLabels($i) 117A
     set {floorItems(117A)} $i
     $w create text 82 180.5 -text 117A -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 77 302 77 168 53 168 53 302 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 77 302 77 168 53 168 53 302 -outline {} -tags {floor1 room}]
     set floorLabels($i) 117
     set {floorItems(117)} $i
     $w create text 65 235 -text 117 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 51 155 51 115 6 115 6 155 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 51 155 51 115 6 115 6 155 -outline {} -tags {floor1 room}]
     set floorLabels($i) 114
     set {floorItems(114)} $i
     $w create text 28.5 135 -text 114 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 95 115 53 115 53 168 95 168 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 95 115 53 115 53 168 95 168 -outline {} -tags {floor1 room}]
     set floorLabels($i) 115
     set {floorItems(115)} $i
     $w create text 74 141.5 -text 115 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 87 113 87 27 10 27 10 113 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 87 113 87 27 10 27 10 113 -outline {} -tags {floor1 room}]
     set floorLabels($i) 116
     set {floorItems(116)} $i
     $w create text 48.5 70 -text 116 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 89 91 128 91 128 113 89 113 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 89 91 128 91 128 113 89 113 -outline {} -tags {floor1 room}]
     set floorLabels($i) 118
     set {floorItems(118)} $i
     $w create text 108.5 102 -text 118 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 178 128 178 132 216 132 216 91 163 91 163 112 149 112 149 128 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 178 128 178 132 216 132 216 91 163 91 163 112 149 112 149 128 -outline {} -tags {floor1 room}]
     set floorLabels($i) 120
     set {floorItems(120)} $i
     $w create text 189.5 111.5 -text 120 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 79 193 87 193 87 169 136 169 136 192 156 192 156 169 175 169 175 246 79 246 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 79 193 87 193 87 169 136 169 136 192 156 192 156 169 175 169 175 246 79 246 -outline {} -tags {floor1 room}]
     set floorLabels($i) 122
     set {floorItems(122)} $i
     $w create text 131 207.5 -text 122 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 138 169 154 169 154 191 138 191 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 138 169 154 169 154 191 138 191 -outline {} -tags {floor1 room}]
     set floorLabels($i) 121
     set {floorItems(121)} $i
     $w create text 146 180 -text 121 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 99 300 126 300 126 309 99 309 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 99 300 126 300 126 309 99 309 -outline {} -tags {floor1 room}]
     set floorLabels($i) 106A
     set {floorItems(106A)} $i
     $w create text 112.5 304.5 -text 106A -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 128 299 128 309 150 309 150 248 99 248 99 299 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 128 299 128 309 150 309 150 248 99 248 99 299 -outline {} -tags {floor1 room}]
     set floorLabels($i) 105
     set {floorItems(105)} $i
     $w create text 124.5 278.5 -text 105 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 174 309 174 300 152 300 152 309 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 174 309 174 300 152 300 152 309 -outline {} -tags {floor1 room}]
     set floorLabels($i) 106B
     set {floorItems(106B)} $i
     $w create text 163 304.5 -text 106B -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 176 299 176 309 216 309 216 248 152 248 152 299 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 176 299 176 309 216 309 216 248 152 248 152 299 -outline {} -tags {floor1 room}]
     set floorLabels($i) 104
     set {floorItems(104)} $i
     $w create text 184 278.5 -text 104 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 138 385 138 337 91 337 91 385 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 138 385 138 337 91 337 91 385 -outline {} -tags {floor1 room}]
     set floorLabels($i) 108
     set {floorItems(108)} $i
     $w create text 114.5 361 -text 108 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 256 337 140 337 140 385 256 385 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 256 337 140 337 140 385 256 385 -outline {} -tags {floor1 room}]
     set floorLabels($i) 107
     set {floorItems(107)} $i
     $w create text 198 361 -text 107 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 300 353 300 329 260 329 260 353 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 300 353 300 329 260 329 260 353 -outline {} -tags {floor1 room}]
     set floorLabels($i) Smoking
     set {floorItems(Smoking)} $i
     $w create text 280 341 -text Smoking -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 314 135 314 170 306 170 306 246 177 246 177 135 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 314 135 314 170 306 170 306 246 177 246 177 135 -outline {} -tags {floor1 room}]
     set floorLabels($i) 123
     set {floorItems(123)} $i
     $w create text 245.5 190.5 -text 123 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 217 248 301 248 301 326 257 326 257 310 217 310 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 217 248 301 248 301 326 257 326 257 310 217 310 -outline {} -tags {floor1 room}]
     set floorLabels($i) 103
     set {floorItems(103)} $i
     $w create text 259 287 -text 103 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 396 188 377 188 377 169 316 169 316 131 396 131 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 396 188 377 188 377 169 316 169 316 131 396 131 -outline {} -tags {floor1 room}]
     set floorLabels($i) 124
     set {floorItems(124)} $i
     $w create text 356 150 -text 124 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 397 226 407 226 407 189 377 189 377 246 397 246 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 397 226 407 226 407 189 377 189 377 246 397 246 -outline {} -tags {floor1 room}]
     set floorLabels($i) 125
     set {floorItems(125)} $i
     $w create text 392 217.5 -text 125 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 399 187 409 187 409 207 474 207 474 164 399 164 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 399 187 409 187 409 207 474 207 474 164 399 164 -outline {} -tags {floor1 room}]
     set floorLabels($i) 126
     set {floorItems(126)} $i
     $w create text 436.5 185.5 -text 126 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 409 209 409 229 399 229 399 253 486 253 486 239 474 239 474 209 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 409 209 409 229 399 229 399 253 486 253 486 239 474 239 474 209 -outline {} -tags {floor1 room}]
     set floorLabels($i) 127
     set {floorItems(127)} $i
     $w create text 436.5 231 -text 127 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 501 164 501 174 495 174 495 188 490 188 490 204 476 204 476 164 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 501 164 501 174 495 174 495 188 490 188 490 204 476 204 476 164 -outline {} -tags {floor1 room}]
     set floorLabels($i) MShower
     set {floorItems(MShower)} $i
     $w create text 488.5 184 -text MShower -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 497 176 513 176 513 204 492 204 492 190 497 190 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 497 176 513 176 513 204 492 204 492 190 497 190 -outline {} -tags {floor1 room}]
     set floorLabels($i) Closet
     set {floorItems(Closet)} $i
     $w create text 502.5 190 -text Closet -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 476 237 476 206 513 206 513 254 488 254 488 237 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 476 237 476 206 513 206 513 254 488 254 488 237 -outline {} -tags {floor1 room}]
     set floorLabels($i) WShower
     set {floorItems(WShower)} $i
     $w create text 494.5 230 -text WShower -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 486 131 558 131 558 135 724 135 724 166 697 166 697 275 553 275 531 254 515 254 515 174 503 174 503 161 486 161 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 486 131 558 131 558 135 724 135 724 166 697 166 697 275 553 275 531 254 515 254 515 174 503 174 503 161 486 161 -outline {} -tags {floor1 room}]
     set floorLabels($i) 130
     set {floorItems(130)} $i
     $w create text 638.5 205 -text 130 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 308 242 339 242 339 248 342 248 342 246 397 246 397 276 393 276 393 309 300 309 300 248 308 248 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 308 242 339 242 339 248 342 248 342 246 397 246 397 276 393 276 393 309 300 309 300 248 308 248 -outline {} -tags {floor1 room}]
     set floorLabels($i) 102
     set {floorItems(102)} $i
     $w create text 367.5 278.5 -text 102 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 397 255 486 255 486 276 397 276 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 397 255 486 255 486 276 397 276 -outline {} -tags {floor1 room}]
     set floorLabels($i) 128
     set {floorItems(128)} $i
     $w create text 441.5 265.5 -text 128 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 510 309 486 309 486 255 530 255 552 277 561 277 561 325 510 325 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 510 309 486 309 486 255 530 255 552 277 561 277 561 325 510 325 -outline {} -tags {floor1 room}]
     set floorLabels($i) 129
     set {floorItems(129)} $i
     $w create text 535.5 293 -text 129 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 696 281 740 281 740 387 642 387 642 389 561 389 561 277 696 277 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 696 281 740 281 740 387 642 387 642 389 561 389 561 277 696 277 -outline {} -tags {floor1 room}]
     set floorLabels($i) 133
     set {floorItems(133)} $i
     $w create text 628.5 335 -text 133 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 742 387 742 281 800 281 800 387 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 742 387 742 281 800 281 800 387 -outline {} -tags {floor1 room}]
     set floorLabels($i) 132
     set {floorItems(132)} $i
     $w create text 771 334 -text 132 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 800 168 800 280 699 280 699 168 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 800 168 800 280 699 280 699 168 -outline {} -tags {floor1 room}]
     set floorLabels($i) 134
     set {floorItems(134)} $i
     $w create text 749.5 224 -text 134 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 726 131 726 166 800 166 800 131 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 726 131 726 166 800 166 800 131 -outline {} -tags {floor1 room}]
     set floorLabels($i) 135
     set {floorItems(135)} $i
     $w create text 763 148.5 -text 135 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 340 360 335 363 331 365 326 366 304 366 304 312 396 312 396 288 400 288 404 288 409 290 413 292 418 297 421 302 422 309 421 318 417 325 411 330 405 332 397 333 344 333 340 334 336 336 335 338 332 342 331 347 332 351 334 354 336 357 341 359 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 340 360 335 363 331 365 326 366 304 366 304 312 396 312 396 288 400 288 404 288 409 290 413 292 418 297 421 302 422 309 421 318 417 325 411 330 405 332 397 333 344 333 340 334 336 336 335 338 332 342 331 347 332 351 334 354 336 357 341 359 -outline {} -tags {floor1 room}]
     set floorLabels($i) {Ramona Stair}
     set {floorItems(Ramona Stair)} $i
     $w create text 368 323 -text {Ramona Stair} -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 30 23 30 5 93 5 98 5 104 7 110 10 116 16 119 20 122 28 123 32 123 68 220 68 220 87 90 87 90 23 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 30 23 30 5 93 5 98 5 104 7 110 10 116 16 119 20 122 28 123 32 123 68 220 68 220 87 90 87 90 23 -outline {} -tags {floor1 room}]
     set floorLabels($i) {University Stair}
     set {floorItems(University Stair)} $i
     $w create text 155 77.5 -text {University Stair} -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 282 37 295 40 312 49 323 56 337 70 352 56 358 48 363 39 365 29 348 25 335 22 321 14 300 5 283 1 260 0 246 0 242 2 236 4 231 8 227 13 223 17 221 22 220 34 260 34 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 282 37 295 40 312 49 323 56 337 70 352 56 358 48 363 39 365 29 348 25 335 22 321 14 300 5 283 1 260 0 246 0 242 2 236 4 231 8 227 13 223 17 221 22 220 34 260 34 -outline {} -tags {floor1 room}]
     set floorLabels($i) {Plaza Stair}
     set {floorItems(Plaza Stair)} $i
     $w create text 317.5 28.5 -text {Plaza Stair} -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 220 34 260 34 282 37 295 40 312 49 323 56 337 70 350 83 365 94 377 100 386 104 386 128 220 128 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 220 34 260 34 282 37 295 40 312 49 323 56 337 70 350 83 365 94 377 100 386 104 386 128 220 128 -outline {} -tags {floor1 room}]
     set floorLabels($i) {Plaza Deck}
     set {floorItems(Plaza Deck)} $i
     $w create text 303 81 -text {Plaza Deck} -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 257 336 77 336 6 336 6 301 77 301 77 310 257 310 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 257 336 77 336 6 336 6 301 77 301 77 310 257 310 -outline {} -tags {floor1 room}]
     set floorLabels($i) 106
     set {floorItems(106)} $i
     $w create text 131.5 318.5 -text 106 -fill $color -anchor c -tags {floor1 label}
-    set i [$w create polygon 146 110 162 110 162 91 130 91 130 115 95 115 95 128 114 128 114 151 157 151 157 153 112 153 112 130 97 130 97 168 175 168 175 131 146 131 -fill {} -tags {floor1 room}]
+    set i [$w create polygon 146 110 162 110 162 91 130 91 130 115 95 115 95 128 114 128 114 151 157 151 157 153 112 153 112 130 97 130 97 168 175 168 175 131 146 131 -outline {} -tags {floor1 room}]
     set floorLabels($i) 119
     set {floorItems(119)} $i
     $w create text 143.5 133 -text 119 -fill $color -anchor c -tags {floor1 label}
@@ -696,207 +696,207 @@ proc fg1 {w color} {
 
 proc fg2 {w color} {
     global floorLabels floorItems
-    set i [$w create polygon 748 188 755 188 755 205 758 205 758 222 800 222 800 168 748 168 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 748 188 755 188 755 205 758 205 758 222 800 222 800 168 748 168 -outline {} -tags {floor2 room}]
     set floorLabels($i) 238
     set {floorItems(238)} $i
     $w create text 774 195 -text 238 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 726 188 746 188 746 166 800 166 800 131 726 131 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 726 188 746 188 746 166 800 166 800 131 726 131 -outline {} -tags {floor2 room}]
     set floorLabels($i) 237
     set {floorItems(237)} $i
     $w create text 763 148.5 -text 237 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 497 187 497 204 559 204 559 324 641 324 643 324 643 291 641 291 641 205 696 205 696 291 694 291 694 314 715 314 715 291 715 205 755 205 755 190 724 190 724 187 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 497 187 497 204 559 204 559 324 641 324 643 324 643 291 641 291 641 205 696 205 696 291 694 291 694 314 715 314 715 291 715 205 755 205 755 190 724 190 724 187 -outline {} -tags {floor2 room}]
     set floorLabels($i) 246
     set {floorItems(246)} $i
     $w create text 600 264 -text 246 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 694 279 643 279 643 314 694 314 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 694 279 643 279 643 314 694 314 -outline {} -tags {floor2 room}]
     set floorLabels($i) 247
     set {floorItems(247)} $i
     $w create text 668.5 296.5 -text 247 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 232 250 308 250 308 242 339 242 339 246 397 246 397 255 476 255 476 250 482 250 559 250 559 274 482 274 482 278 396 278 396 274 232 274 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 232 250 308 250 308 242 339 242 339 246 397 246 397 255 476 255 476 250 482 250 559 250 559 274 482 274 482 278 396 278 396 274 232 274 -outline {} -tags {floor2 room}]
     set floorLabels($i) 202
     set {floorItems(202)} $i
     $w create text 285.5 260 -text 202 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 53 228 53 338 176 338 233 338 233 196 306 196 306 180 175 180 175 169 156 169 156 196 176 196 176 228 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 53 228 53 338 176 338 233 338 233 196 306 196 306 180 175 180 175 169 156 169 156 196 176 196 176 228 -outline {} -tags {floor2 room}]
     set floorLabels($i) 206
     set {floorItems(206)} $i
     $w create text 143 267 -text 206 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 51 277 6 277 6 338 51 338 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 51 277 6 277 6 338 51 338 -outline {} -tags {floor2 room}]
     set floorLabels($i) 212
     set {floorItems(212)} $i
     $w create text 28.5 307.5 -text 212 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 557 276 486 276 486 309 510 309 510 325 557 325 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 557 276 486 276 486 309 510 309 510 325 557 325 -outline {} -tags {floor2 room}]
     set floorLabels($i) 245
     set {floorItems(245)} $i
     $w create text 521.5 300.5 -text 245 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 560 389 599 389 599 326 560 326 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 560 389 599 389 599 326 560 326 -outline {} -tags {floor2 room}]
     set floorLabels($i) 244
     set {floorItems(244)} $i
     $w create text 579.5 357.5 -text 244 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 601 389 601 326 643 326 643 389 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 601 389 601 326 643 326 643 389 -outline {} -tags {floor2 room}]
     set floorLabels($i) 243
     set {floorItems(243)} $i
     $w create text 622 357.5 -text 243 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 688 316 645 316 645 365 688 365 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 688 316 645 316 645 365 688 365 -outline {} -tags {floor2 room}]
     set floorLabels($i) 242
     set {floorItems(242)} $i
     $w create text 666.5 340.5 -text 242 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 802 367 759 367 759 226 802 226 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 802 367 759 367 759 226 802 226 -outline {} -tags {floor2 room}]
     set floorLabels($i) {Barbecue Deck}
     set {floorItems(Barbecue Deck)} $i
     $w create text 780.5 296.5 -text {Barbecue Deck} -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 755 262 755 314 717 314 717 262 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 755 262 755 314 717 314 717 262 -outline {} -tags {floor2 room}]
     set floorLabels($i) 240
     set {floorItems(240)} $i
     $w create text 736 288 -text 240 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 755 316 689 316 689 365 755 365 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 755 316 689 316 689 365 755 365 -outline {} -tags {floor2 room}]
     set floorLabels($i) 241
     set {floorItems(241)} $i
     $w create text 722 340.5 -text 241 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 755 206 717 206 717 261 755 261 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 755 206 717 206 717 261 755 261 -outline {} -tags {floor2 room}]
     set floorLabels($i) 239
     set {floorItems(239)} $i
     $w create text 736 233.5 -text 239 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 695 277 643 277 643 206 695 206 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 695 277 643 277 643 206 695 206 -outline {} -tags {floor2 room}]
     set floorLabels($i) 248
     set {floorItems(248)} $i
     $w create text 669 241.5 -text 248 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 676 135 676 185 724 185 724 135 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 676 135 676 185 724 185 724 135 -outline {} -tags {floor2 room}]
     set floorLabels($i) 236
     set {floorItems(236)} $i
     $w create text 700 160 -text 236 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 675 135 635 135 635 145 628 145 628 185 675 185 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 675 135 635 135 635 145 628 145 628 185 675 185 -outline {} -tags {floor2 room}]
     set floorLabels($i) 235
     set {floorItems(235)} $i
     $w create text 651.5 160 -text 235 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 626 143 633 143 633 135 572 135 572 143 579 143 579 185 626 185 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 626 143 633 143 633 135 572 135 572 143 579 143 579 185 626 185 -outline {} -tags {floor2 room}]
     set floorLabels($i) 234
     set {floorItems(234)} $i
     $w create text 606 160 -text 234 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 557 135 571 135 571 145 578 145 578 185 527 185 527 131 557 131 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 557 135 571 135 571 145 578 145 578 185 527 185 527 131 557 131 -outline {} -tags {floor2 room}]
     set floorLabels($i) 233
     set {floorItems(233)} $i
     $w create text 552.5 158 -text 233 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 476 249 557 249 557 205 476 205 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 476 249 557 249 557 205 476 205 -outline {} -tags {floor2 room}]
     set floorLabels($i) 230
     set {floorItems(230)} $i
     $w create text 516.5 227 -text 230 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 476 164 486 164 486 131 525 131 525 185 476 185 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 476 164 486 164 486 131 525 131 525 185 476 185 -outline {} -tags {floor2 room}]
     set floorLabels($i) 232
     set {floorItems(232)} $i
     $w create text 500.5 158 -text 232 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 476 186 495 186 495 204 476 204 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 476 186 495 186 495 204 476 204 -outline {} -tags {floor2 room}]
     set floorLabels($i) 229
     set {floorItems(229)} $i
     $w create text 485.5 195 -text 229 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 474 207 409 207 409 187 399 187 399 164 474 164 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 474 207 409 207 409 187 399 187 399 164 474 164 -outline {} -tags {floor2 room}]
     set floorLabels($i) 227
     set {floorItems(227)} $i
     $w create text 436.5 185.5 -text 227 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 399 228 399 253 474 253 474 209 409 209 409 228 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 399 228 399 253 474 253 474 209 409 209 409 228 -outline {} -tags {floor2 room}]
     set floorLabels($i) 228
     set {floorItems(228)} $i
     $w create text 436.5 231 -text 228 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 397 246 397 226 407 226 407 189 377 189 377 246 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 397 246 397 226 407 226 407 189 377 189 377 246 -outline {} -tags {floor2 room}]
     set floorLabels($i) 226
     set {floorItems(226)} $i
     $w create text 392 217.5 -text 226 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 377 169 316 169 316 131 397 131 397 188 377 188 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 377 169 316 169 316 131 397 131 397 188 377 188 -outline {} -tags {floor2 room}]
     set floorLabels($i) 225
     set {floorItems(225)} $i
     $w create text 356.5 150 -text 225 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 234 198 306 198 306 249 234 249 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 234 198 306 198 306 249 234 249 -outline {} -tags {floor2 room}]
     set floorLabels($i) 224
     set {floorItems(224)} $i
     $w create text 270 223.5 -text 224 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 270 179 306 179 306 170 314 170 314 135 270 135 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 270 179 306 179 306 170 314 170 314 135 270 135 -outline {} -tags {floor2 room}]
     set floorLabels($i) 223
     set {floorItems(223)} $i
     $w create text 292 157 -text 223 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 268 179 221 179 221 135 268 135 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 268 179 221 179 221 135 268 135 -outline {} -tags {floor2 room}]
     set floorLabels($i) 222
     set {floorItems(222)} $i
     $w create text 244.5 157 -text 222 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 177 179 219 179 219 135 177 135 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 177 179 219 179 219 135 177 135 -outline {} -tags {floor2 room}]
     set floorLabels($i) 221
     set {floorItems(221)} $i
     $w create text 198 157 -text 221 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 299 327 349 327 349 284 341 284 341 276 299 276 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 299 327 349 327 349 284 341 284 341 276 299 276 -outline {} -tags {floor2 room}]
     set floorLabels($i) 204
     set {floorItems(204)} $i
     $w create text 324 301.5 -text 204 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 234 276 297 276 297 327 257 327 257 338 234 338 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 234 276 297 276 297 327 257 327 257 338 234 338 -outline {} -tags {floor2 room}]
     set floorLabels($i) 205
     set {floorItems(205)} $i
     $w create text 265.5 307 -text 205 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 256 385 256 340 212 340 212 385 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 256 385 256 340 212 340 212 385 -outline {} -tags {floor2 room}]
     set floorLabels($i) 207
     set {floorItems(207)} $i
     $w create text 234 362.5 -text 207 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 210 340 164 340 164 385 210 385 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 210 340 164 340 164 385 210 385 -outline {} -tags {floor2 room}]
     set floorLabels($i) 208
     set {floorItems(208)} $i
     $w create text 187 362.5 -text 208 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 115 340 162 340 162 385 115 385 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 115 340 162 340 162 385 115 385 -outline {} -tags {floor2 room}]
     set floorLabels($i) 209
     set {floorItems(209)} $i
     $w create text 138.5 362.5 -text 209 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 89 228 89 156 53 156 53 228 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 89 228 89 156 53 156 53 228 -outline {} -tags {floor2 room}]
     set floorLabels($i) 217
     set {floorItems(217)} $i
     $w create text 71 192 -text 217 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 89 169 97 169 97 190 89 190 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 89 169 97 169 97 190 89 190 -outline {} -tags {floor2 room}]
     set floorLabels($i) 217A
     set {floorItems(217A)} $i
     $w create text 93 179.5 -text 217A -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 89 156 89 168 95 168 95 135 53 135 53 156 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 89 156 89 168 95 168 95 135 53 135 53 156 -outline {} -tags {floor2 room}]
     set floorLabels($i) 216
     set {floorItems(216)} $i
     $w create text 71 145.5 -text 216 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 51 179 51 135 6 135 6 179 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 51 179 51 135 6 135 6 179 -outline {} -tags {floor2 room}]
     set floorLabels($i) 215
     set {floorItems(215)} $i
     $w create text 28.5 157 -text 215 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 51 227 6 227 6 180 51 180 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 51 227 6 227 6 180 51 180 -outline {} -tags {floor2 room}]
     set floorLabels($i) 214
     set {floorItems(214)} $i
     $w create text 28.5 203.5 -text 214 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 51 275 6 275 6 229 51 229 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 51 275 6 275 6 229 51 229 -outline {} -tags {floor2 room}]
     set floorLabels($i) 213
     set {floorItems(213)} $i
     $w create text 28.5 252 -text 213 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 114 340 67 340 67 385 114 385 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 114 340 67 340 67 385 114 385 -outline {} -tags {floor2 room}]
     set floorLabels($i) 210
     set {floorItems(210)} $i
     $w create text 90.5 362.5 -text 210 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 59 389 59 385 65 385 65 340 1 340 1 389 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 59 389 59 385 65 385 65 340 1 340 1 389 -outline {} -tags {floor2 room}]
     set floorLabels($i) 211
     set {floorItems(211)} $i
     $w create text 33 364.5 -text 211 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 393 309 350 309 350 282 342 282 342 276 393 276 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 393 309 350 309 350 282 342 282 342 276 393 276 -outline {} -tags {floor2 room}]
     set floorLabels($i) 203
     set {floorItems(203)} $i
     $w create text 367.5 292.5 -text 203 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 99 191 91 191 91 226 174 226 174 198 154 198 154 192 109 192 109 169 99 169 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 99 191 91 191 91 226 174 226 174 198 154 198 154 192 109 192 109 169 99 169 -outline {} -tags {floor2 room}]
     set floorLabels($i) 220
     set {floorItems(220)} $i
     $w create text 132.5 208.5 -text 220 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 339 205 307 205 307 171 339 171 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 339 205 307 205 307 171 339 171 -outline {} -tags {floor2 room}]
     set floorLabels($i) {Priv Lift2}
     set {floorItems(Priv Lift2)} $i
     $w create text 323 188 -text {Priv Lift2} -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 307 240 339 240 339 206 307 206 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 307 240 339 240 339 206 307 206 -outline {} -tags {floor2 room}]
     set floorLabels($i) {Pub Lift 2}
     set {floorItems(Pub Lift 2)} $i
     $w create text 323 223 -text {Pub Lift 2} -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 175 168 97 168 97 131 175 131 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 175 168 97 168 97 131 175 131 -outline {} -tags {floor2 room}]
     set floorLabels($i) 218
     set {floorItems(218)} $i
     $w create text 136 149.5 -text 218 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 154 191 111 191 111 169 154 169 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 154 191 111 191 111 169 154 169 -outline {} -tags {floor2 room}]
     set floorLabels($i) 219
     set {floorItems(219)} $i
     $w create text 132.5 180 -text 219 -fill $color -anchor c -tags {floor2 label}
-    set i [$w create polygon 375 246 375 172 341 172 341 246 -fill {} -tags {floor2 room}]
+    set i [$w create polygon 375 246 375 172 341 172 341 246 -outline {} -tags {floor2 room}]
     set floorLabels($i) 201
     set {floorItems(201)} $i
     $w create text 358 209 -text 201 -fill $color -anchor c -tags {floor2 label}
@@ -1066,135 +1066,135 @@ proc fg2 {w color} {
 
 proc fg3 {w color} {
     global floorLabels floorItems
-    set i [$w create polygon 89 228 89 180 70 180 70 228 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 89 228 89 180 70 180 70 228 -outline {} -tags {floor3 room}]
     set floorLabels($i) 316
     set {floorItems(316)} $i
     $w create text 79.5 204 -text 316 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 115 368 162 368 162 323 115 323 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 115 368 162 368 162 323 115 323 -outline {} -tags {floor3 room}]
     set floorLabels($i) 309
     set {floorItems(309)} $i
     $w create text 138.5 345.5 -text 309 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 164 323 164 368 211 368 211 323 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 164 323 164 368 211 368 211 323 -outline {} -tags {floor3 room}]
     set floorLabels($i) 308
     set {floorItems(308)} $i
     $w create text 187.5 345.5 -text 308 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 256 368 212 368 212 323 256 323 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 256 368 212 368 212 323 256 323 -outline {} -tags {floor3 room}]
     set floorLabels($i) 307
     set {floorItems(307)} $i
     $w create text 234 345.5 -text 307 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 244 276 297 276 297 327 260 327 260 321 244 321 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 244 276 297 276 297 327 260 327 260 321 244 321 -outline {} -tags {floor3 room}]
     set floorLabels($i) 305
     set {floorItems(305)} $i
     $w create text 270.5 301.5 -text 305 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 251 219 251 203 244 203 244 219 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 251 219 251 203 244 203 244 219 -outline {} -tags {floor3 room}]
     set floorLabels($i) 324B
     set {floorItems(324B)} $i
     $w create text 247.5 211 -text 324B -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 251 249 244 249 244 232 251 232 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 251 249 244 249 244 232 251 232 -outline {} -tags {floor3 room}]
     set floorLabels($i) 324A
     set {floorItems(324A)} $i
     $w create text 247.5 240.5 -text 324A -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 223 135 223 179 177 179 177 135 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 223 135 223 179 177 179 177 135 -outline {} -tags {floor3 room}]
     set floorLabels($i) 320
     set {floorItems(320)} $i
     $w create text 200 157 -text 320 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 114 368 114 323 67 323 67 368 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 114 368 114 323 67 323 67 368 -outline {} -tags {floor3 room}]
     set floorLabels($i) 310
     set {floorItems(310)} $i
     $w create text 90.5 345.5 -text 310 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 23 277 23 321 68 321 68 277 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 23 277 23 321 68 321 68 277 -outline {} -tags {floor3 room}]
     set floorLabels($i) 312
     set {floorItems(312)} $i
     $w create text 45.5 299 -text 312 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 23 229 68 229 68 275 23 275 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 23 229 68 229 68 275 23 275 -outline {} -tags {floor3 room}]
     set floorLabels($i) 313
     set {floorItems(313)} $i
     $w create text 45.5 252 -text 313 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 68 227 23 227 23 180 68 180 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 68 227 23 227 23 180 68 180 -outline {} -tags {floor3 room}]
     set floorLabels($i) 314
     set {floorItems(314)} $i
     $w create text 45.5 203.5 -text 314 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 95 179 95 135 23 135 23 179 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 95 179 95 135 23 135 23 179 -outline {} -tags {floor3 room}]
     set floorLabels($i) 315
     set {floorItems(315)} $i
     $w create text 59 157 -text 315 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 99 226 99 204 91 204 91 226 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 99 226 99 204 91 204 91 226 -outline {} -tags {floor3 room}]
     set floorLabels($i) 316B
     set {floorItems(316B)} $i
     $w create text 95 215 -text 316B -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 91 202 99 202 99 180 91 180 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 91 202 99 202 99 180 91 180 -outline {} -tags {floor3 room}]
     set floorLabels($i) 316A
     set {floorItems(316A)} $i
     $w create text 95 191 -text 316A -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 97 169 109 169 109 192 154 192 154 198 174 198 174 226 101 226 101 179 97 179 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 97 169 109 169 109 192 154 192 154 198 174 198 174 226 101 226 101 179 97 179 -outline {} -tags {floor3 room}]
     set floorLabels($i) 319
     set {floorItems(319)} $i
     $w create text 141.5 209 -text 319 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 65 368 58 368 58 389 1 389 1 333 23 333 23 323 65 323 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 65 368 58 368 58 389 1 389 1 333 23 333 23 323 65 323 -outline {} -tags {floor3 room}]
     set floorLabels($i) 311
     set {floorItems(311)} $i
     $w create text 29.5 361 -text 311 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 154 191 111 191 111 169 154 169 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 154 191 111 191 111 169 154 169 -outline {} -tags {floor3 room}]
     set floorLabels($i) 318
     set {floorItems(318)} $i
     $w create text 132.5 180 -text 318 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 175 168 97 168 97 131 175 131 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 175 168 97 168 97 131 175 131 -outline {} -tags {floor3 room}]
     set floorLabels($i) 317
     set {floorItems(317)} $i
     $w create text 136 149.5 -text 317 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 274 194 274 221 306 221 306 194 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 274 194 274 221 306 221 306 194 -outline {} -tags {floor3 room}]
     set floorLabels($i) 323
     set {floorItems(323)} $i
     $w create text 290 207.5 -text 323 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 306 222 274 222 274 249 306 249 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 306 222 274 222 274 249 306 249 -outline {} -tags {floor3 room}]
     set floorLabels($i) 325
     set {floorItems(325)} $i
     $w create text 290 235.5 -text 325 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 263 179 224 179 224 135 263 135 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 263 179 224 179 224 135 263 135 -outline {} -tags {floor3 room}]
     set floorLabels($i) 321
     set {floorItems(321)} $i
     $w create text 243.5 157 -text 321 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 314 169 306 169 306 192 273 192 264 181 264 135 314 135 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 314 169 306 169 306 192 273 192 264 181 264 135 314 135 -outline {} -tags {floor3 room}]
     set floorLabels($i) 322
     set {floorItems(322)} $i
     $w create text 293.5 163.5 -text 322 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 307 240 339 240 339 206 307 206 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 307 240 339 240 339 206 307 206 -outline {} -tags {floor3 room}]
     set floorLabels($i) {Pub Lift3}
     set {floorItems(Pub Lift3)} $i
     $w create text 323 223 -text {Pub Lift3} -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 339 205 307 205 307 171 339 171 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 339 205 307 205 307 171 339 171 -outline {} -tags {floor3 room}]
     set floorLabels($i) {Priv Lift3}
     set {floorItems(Priv Lift3)} $i
     $w create text 323 188 -text {Priv Lift3} -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 350 284 376 284 376 276 397 276 397 309 350 309 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 350 284 376 284 376 276 397 276 397 309 350 309 -outline {} -tags {floor3 room}]
     set floorLabels($i) 303
     set {floorItems(303)} $i
     $w create text 373.5 292.5 -text 303 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 272 203 272 249 252 249 252 230 244 230 244 221 252 221 252 203 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 272 203 272 249 252 249 252 230 244 230 244 221 252 221 252 203 -outline {} -tags {floor3 room}]
     set floorLabels($i) 324
     set {floorItems(324)} $i
     $w create text 262 226 -text 324 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 299 276 299 327 349 327 349 284 341 284 341 276 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 299 276 299 327 349 327 349 284 341 284 341 276 -outline {} -tags {floor3 room}]
     set floorLabels($i) 304
     set {floorItems(304)} $i
     $w create text 324 301.5 -text 304 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 375 246 375 172 341 172 341 246 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 375 246 375 172 341 172 341 246 -outline {} -tags {floor3 room}]
     set floorLabels($i) 301
     set {floorItems(301)} $i
     $w create text 358 209 -text 301 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 397 246 377 246 377 185 397 185 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 397 246 377 246 377 185 397 185 -outline {} -tags {floor3 room}]
     set floorLabels($i) 327
     set {floorItems(327)} $i
     $w create text 387 215.5 -text 327 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 316 131 316 169 377 169 377 185 397 185 397 131 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 316 131 316 169 377 169 377 185 397 185 397 131 -outline {} -tags {floor3 room}]
     set floorLabels($i) 326
     set {floorItems(326)} $i
     $w create text 356.5 150 -text 326 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 308 251 242 251 242 274 342 274 342 282 375 282 375 274 397 274 397 248 339 248 339 242 308 242 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 308 251 242 251 242 274 342 274 342 282 375 282 375 274 397 274 397 248 339 248 339 242 308 242 -outline {} -tags {floor3 room}]
     set floorLabels($i) 302
     set {floorItems(302)} $i
     $w create text 319.5 261 -text 302 -fill $color -anchor c -tags {floor3 label}
-    set i [$w create polygon 70 321 242 321 242 200 259 200 259 203 272 203 272 193 263 180 242 180 175 180 175 169 156 169 156 196 177 196 177 228 107 228 70 228 70 275 107 275 107 248 160 248 160 301 107 301 107 275 70 275 -fill {} -tags {floor3 room}]
+    set i [$w create polygon 70 321 242 321 242 200 259 200 259 203 272 203 272 193 263 180 242 180 175 180 175 169 156 169 156 196 177 196 177 228 107 228 70 228 70 275 107 275 107 248 160 248 160 301 107 301 107 275 70 275 -outline {} -tags {floor3 room}]
     set floorLabels($i) 306
     set {floorItems(306)} $i
     $w create text 200.5 284.5 -text 306 -fill $color -anchor c -tags {floor3 label}
diff --git a/library/demos/items.tcl b/library/demos/items.tcl
index 000e4cb..be9214a 100644
--- a/library/demos/items.tcl
+++ b/library/demos/items.tcl
@@ -95,13 +95,13 @@ $c create line 12c 6c 13.5c 4.5c 16.5c 7.5c 18c 6c \
 $c create text 25c .2c -text Polygons -anchor n
 $c create polygon 21c 1.0c 22.5c 1.75c 24c 1.0c 23.25c 2.5c \
 	24c 4.0c 22.5c 3.25c 21c 4.0c 21.75c 2.5c -fill $green \
-	-outline black -width 4 -tags item
+	-outline {} -width 4 -tags item
 $c create polygon 25c 4c 25c 4c 25c 1c 26c 1c 27c 4c 28c 1c \
-	29c 1c 29c 4c 29c 4c -fill $red -smooth on -tags item
+	29c 1c 29c 4c 29c 4c -fill $red -outline {} -smooth on -tags item
 $c create polygon 22c 4.5c 25c 4.5c 25c 6.75c 28c 6.75c \
 	28c 5.25c 24c 5.25c 24c 6.0c 26c 6c 26c 7.5c 22c 7.5c \
 	-stipple @[file join $tk_demoDirectory images gray25.xbm] \
-	-outline black -tags item
+	-fill $blue -outline {} -tags item
 
 $c create text 5c 8.2c -text Rectangles -anchor n
 $c create rectangle 1c 9.5c 4c 12.5c -outline $red -width 3m -tags item
@@ -126,8 +126,10 @@ $c create text 25.5c 11c -anchor w -font $font1 -fill $blue \
 	-text "Several lines,\n each centered\nindividually,\nand all anchored\nat the left edge." \
 	-justify center -tags item
 $c create rectangle 24.9c 13.9c 25.1c 14.1c
+catch {
 $c create text 25c 14c -font $font2 -anchor c -fill $red -angle 15 \
 	-text "Angled characters" -tags item
+}
 
 $c create text 5c 16.2c -text Arcs -anchor n
 $c create arc 0.5c 17c 7c 20c -fill $green -outline black \
@@ -140,13 +142,15 @@ $c create arc 0.5c 20c 9.5c 24c -width 4m -style pieslice \
 $c create arc 5.5c 20.5c 9.5c 23.5c -width 4m -style chord \
 	-fill $blue -outline {} -start 45 -extent 270  -tags item
 
+$c create text 15c 16.2c -text "Bitmaps and Images" -anchor n
+catch {
 image create photo items.ousterhout \
     -file [file join $tk_demoDirectory images ouster.png]
 image create photo items.ousterhout.active -format "png -alpha 0.5" \
     -file [file join $tk_demoDirectory images ouster.png]
-$c create text 15c 16.2c -text "Bitmaps and Images" -anchor n
 $c create image 13c 20c -tags item -image items.ousterhout \
     -activeimage items.ousterhout.active
+}
 $c create bitmap 17c 18.5c -tags item \
 	-bitmap @[file join $tk_demoDirectory images noletter.xbm]
 $c create bitmap 17c 21.5c -tags item \
diff --git a/library/demos/knightstour.tcl b/library/demos/knightstour.tcl
index 6113db2..3c29720 100644
--- a/library/demos/knightstour.tcl
+++ b/library/demos/knightstour.tcl
@@ -175,7 +175,7 @@ proc CreateGUI {} {
     wm withdraw $dlg
     set f [ttk::frame $dlg.f]
     set c [canvas $f.c -width 240 -height 240]
-    text $f.txt -width 10 -height 1 -background white \
+    text $f.txt -width 10 -height 1 \
         -yscrollcommand [list $f.vs set] -font {Arial 8}
     ttk::scrollbar $f.vs -command [list $f.txt yview]
 
@@ -200,7 +200,7 @@ proc CreateGUI {} {
             set coords [list [expr {$col * 30 + 4}] [expr {$row * 30 + 4}] \
                             [expr {$col * 30 + 30}] [expr {$row * 30 + 30}]]
             $c create rectangle $coords -fill $fill -disabledfill $dfill \
-                -width 2 -state disabled
+                -width 2 -state disabled -outline black
         }
     }
     if {[tk windowingsystem] ne "x11"} {
diff --git a/library/demos/ruler.tcl b/library/demos/ruler.tcl
index 557b680..f7bc37b 100644
--- a/library/demos/ruler.tcl
+++ b/library/demos/ruler.tcl
@@ -19,8 +19,13 @@ package require Tk
 
 proc rulerMkTab {c x y} {
     upvar #0 demo_rulerInfo v
-    $c create polygon $x $y [expr {$x+$v(size)}] [expr {$y+$v(size)}] \
-	    [expr {$x-$v(size)}] [expr {$y+$v(size)}]
+    set newTab [$c create polygon $x $y \
+	    [expr {$x+$v(size)}] [expr {$y+$v(size)}] \
+	    [expr {$x-$v(size)}] [expr {$y+$v(size)}]]
+    set fill [$c itemcget $newTab -outline]
+    $c itemconfigure $newTab -fill $fill -outline {}
+    set v(normalStyle) "-fill $fill"
+    return $newTab
 }
 
 set w .ruler
@@ -47,7 +52,6 @@ set demo_rulerInfo(right) [winfo fpixels $c 13c]
 set demo_rulerInfo(top) [winfo fpixels $c 1c]
 set demo_rulerInfo(bottom) [winfo fpixels $c 1.5c]
 set demo_rulerInfo(size) [winfo fpixels $c .2c]
-set demo_rulerInfo(normalStyle) "-fill black"
 # Main widget program sets variable tk_demoDirectory
 if {[winfo depth $c] > 1} {
     set demo_rulerInfo(activeStyle) "-fill red -stipple {}"
@@ -69,7 +73,7 @@ for {set i 0} {$i < 12} {incr i} {
     $c create text $x.15c .75c -text $i -anchor sw
 }
 $c addtag well withtag [$c create rect 13.2c 1c 13.8c 0.5c \
-	-outline black -fill [lindex [$c config -bg] 4]]
+	-fill [lindex [$c config -bg] 4]]
 $c addtag well withtag [rulerMkTab $c [winfo pixels $c 13.5c] \
 	[winfo pixels $c .65c]]
 
diff --git a/library/demos/unicodeout.tcl b/library/demos/unicodeout.tcl
index 9cd3661..ca325a4 100644
--- a/library/demos/unicodeout.tcl
+++ b/library/demos/unicodeout.tcl
@@ -109,10 +109,10 @@ if {[usePresentationFormsFor Arabic]} {
 }
 addSample $w "Trad. Chinese"  "\u4E2D\u570B\u7684\u6F22\u5B57"
 addSample $w "Simpl. Chinese" "\u6C49\u8BED"
-addSample $w French "Langue fran\u00E7aise"
+addSample $w French "Langue fran\xE7aise"
 addSample $w Greek \
-	 "\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE " \
-	 "\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1"
+	"\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE " \
+	"\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1"
 if {[usePresentationFormsFor Hebrew]} {
     # Visual order (pre-layouted)
     addSample $w Hebrew \
@@ -123,16 +123,23 @@ if {[usePresentationFormsFor Hebrew]} {
 	    "\u05DB\u05EA\u05D1 \u05E2\u05D1\u05E8\u05D9\u05EA"
 }
 addSample $w Hindi \
-    "\u0939\u093f\u0928\u094d\u0926\u0940 \u092d\u093e\u0937\u093e"
-addSample $w Icelandic "\u00CDslenska"
+    "\u0939\u093F\u0928\u094D\u0926\u0940 \u092D\u093E\u0937\u093E"
+addSample $w Icelandic "\xCDslenska"
 addSample $w Japanese \
-	 "\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, " \
-	 "\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA"
+	"\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, " \
+	"\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA"
 addSample $w Korean "\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00"
 addSample $w Russian \
 	"\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A"
-addSample $w Emoji \
-	"\U1F600\U1F4A9\U1F44D\U1F1F3\U1F1F1"
+if {([tk windowingsystem] ne "x11") || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))} {
+    if {[package vsatisfies [package provide Tcl] 8.7-]} {
+	addSample $w Emoji \
+		"\U1F600\U1F4A9\U1F44D\U1F1F3\U1F1F1"
+    } else {
+	addSample $w Emoji \
+		"\uD83D\uDE00\uD83D\uDCA9\uD83D\uDC4D\uD83C\uDDF3\uD83C\uDDF1"
+    }
+}
 
 ## We're done processing, so change things back to normal running...
 destroy $w.wait
diff --git a/library/entry.tcl b/library/entry.tcl
index 0cc9ffb..2aab934 100644
--- a/library/entry.tcl
+++ b/library/entry.tcl
@@ -74,11 +74,6 @@ bind Entry <<TraverseIn>> {
 
 # Standard Motif bindings:
 
-bind Entry <Map> {
-    if {[tk windowingsystem] eq "aqua"} {
-    	::tk::RegisterServiceWidget %W
-    }
-}
 bind Entry <1> {
     tk::EntryButton1 %W %x
     %W selection clear
@@ -277,6 +272,25 @@ bind Entry <Meta-Delete> {
     }
 }
 
+# Bindings for IME text input and accents.
+
+bind Entry <<TkStartIMEMarkedText>> {
+    dict set ::tk::Priv(IMETextMark) "%W" [%W index insert]
+}
+bind Entry <<TkEndIMEMarkedText>> {
+    if { [catch {dict get $::tk::Priv(IMETextMark) "%W"} mark] } {
+	bell
+    } else {
+	%W selection range $mark insert
+    }
+}
+bind Entry <<TkClearIMEMarkedText>> {
+    %W delete [dict get $::tk::Priv(IMETextMark) "%W"] [%W index insert]
+}
+bind Entry <<TkAccentBackspace>> {
+    tk::EntryBackspace %W
+}
+
 # A few additional bindings of my own.
 
 bind Entry <2> {
diff --git a/library/iconlist.tcl b/library/iconlist.tcl
index 30352a1..753f183 100644
--- a/library/iconlist.tcl
+++ b/library/iconlist.tcl
@@ -447,10 +447,10 @@ package require Tk 8.6
 	bind $canvas <Shift-B1-Motion>	[namespace code {my ShiftMotion1 %x %y}]
 
 	if {[tk windowingsystem] eq "aqua"} {
-	    bind $canvas <Shift-MouseWheel>	[namespace code {my MouseWheel [expr {40 * (%W)}]}]
-	    bind $canvas <Option-Shift-MouseWheel>	[namespace code {my MouseWheel [expr {400 * (%W)}]}]
+	    bind $canvas <Shift-MouseWheel>	[namespace code {my MouseWheel [expr {40 * (%D)}]}]
+	    bind $canvas <Option-Shift-MouseWheel>	[namespace code {my MouseWheel [expr {400 * (%D)}]}]
 	} else {
-	    bind $canvas <Shift-MouseWheel>	[namespace code {my MouseWheel %W}]
+	    bind $canvas <Shift-MouseWheel>	[namespace code {my MouseWheel %D}]
 	}
 	if {[tk windowingsystem] eq "x11"} {
 	    bind $canvas <Shift-4>	[namespace code {my MouseWheel 120}]
@@ -509,6 +509,12 @@ package require Tk 8.6
 	if {$noScroll || $::tk_strictMotif} {
 	    return
 	}
+	# We must make sure that positive and negative movements are rounded
+	# equally to integers, avoiding the problem that
+	#     (int)1/120 = 0,
+	# but
+	#     (int)-1/120 = -1
+	# The following code ensure equal +/- behaviour.
 	if {$amount > 0} {
 	    $canvas xview scroll [expr {(-119-$amount) / 120}] units
 	} else {
diff --git a/library/listbox.tcl b/library/listbox.tcl
index dc2296c..3802223 100644
--- a/library/listbox.tcl
+++ b/library/listbox.tcl
@@ -194,11 +194,25 @@ if {[tk windowingsystem] eq "aqua"} {
         %W xview scroll [expr {-10 * (%D)}] units
     }
 } else {
+    # We must make sure that positive and negative movements are rounded
+    # equally to integers, avoiding the problem that
+    #     (int)1/30 = 0,
+    # but
+    #     (int)-1/30 = -1
+    # The following code ensure equal +/- behaviour.
     bind Listbox <MouseWheel> {
-        %W yview scroll [expr {-(%D/30)}] units
+	if {%D >= 0} {
+	    %W yview scroll [expr {-%D/30}] units
+	} else {
+	    %W yview scroll [expr {(29-%D)/30}] units
+	}
     }
     bind Listbox <Shift-MouseWheel> {
-        %W xview scroll [expr {-(%D/30)}] units
+	if {%D >= 0} {
+	    %W xview scroll [expr {-%D/30}] units
+	} else {
+	    %W xview scroll [expr {(29-%D)/30}] units
+	}
     }
 }
 
diff --git a/library/scrlbar.tcl b/library/scrlbar.tcl
index 0cbbc66..df4b8ab 100644
--- a/library/scrlbar.tcl
+++ b/library/scrlbar.tcl
@@ -143,11 +143,25 @@ if {[tk windowingsystem] eq "aqua"} {
 	tk::ScrollByUnits %W h [expr {-10 * (%D)}]
     }
 } else {
+    # We must make sure that positive and negative movements are rounded
+    # equally to integers, avoiding the problem that
+    #     (int)1/30 = 0,
+    # but
+    #     (int)-1/30 = -1
+    # The following code ensure equal +/- behaviour.
     bind Scrollbar <MouseWheel> {
-	tk::ScrollByUnits %W v [expr {-(%D / 30)}]
+	if {%D >= 0} {
+	    tk::ScrollByUnits %W v [expr {-%D/30}]
+	} else {
+	    tk::ScrollByUnits %W v [expr {(29-%D)/30}]
+	}
     }
     bind Scrollbar <Shift-MouseWheel> {
-	tk::ScrollByUnits %W h [expr {-(%D / 30)}]
+	if {%D >= 0} {
+	    tk::ScrollByUnits %W h [expr {-%D/30}]
+	} else {
+	    tk::ScrollByUnits %W h [expr {(29-%D)/30}]
+	}
     }
 }
 
diff --git a/library/text.tcl b/library/text.tcl
index 964a5fb..e9c8bfe 100644
--- a/library/text.tcl
+++ b/library/text.tcl
@@ -42,12 +42,6 @@
 
 # Standard Motif bindings:
 
-bind Text <Map> {
-    if {[tk windowingsystem] eq "aqua"} {
-    	::tk::RegisterServiceWidget %W
-    }
-}
-
 bind Text <1> {
     tk::TextButton1 %W %x %y
     %W tag remove sel 0.0 end
@@ -397,6 +391,26 @@ bind Text <Meta-Delete> {
     }
 }
 
+# Bindings for IME text input.
+
+bind Text <<TkStartIMEMarkedText>> {
+    dict set ::tk::Priv(IMETextMark) "%W" [%W index insert]
+}
+bind Text <<TkEndIMEMarkedText>> {
+    if { [catch {dict get $::tk::Priv(IMETextMark) "%W"} mark] } {
+	bell
+    } else {
+	%W tag add IMEmarkedtext $mark insert
+	%W tag configure IMEmarkedtext -underline on
+    }
+}
+bind Text <<TkClearIMEMarkedText>> {
+    %W delete IMEmarkedtext.first IMEmarkedtext.last
+}
+bind Text <<TkAccentBackspace>> {
+    %W delete insert-1c
+}
+
 # Macintosh only bindings:
 
 if {[tk windowingsystem] eq "aqua"} {
@@ -1223,7 +1237,6 @@ proc ::tk::TextScanDrag {w x y} {
 	$w scan dragto $x $y
     }
 }
-
 # ::tk::TextUndoRedoProcessMarks --
 #
 # This proc is executed after an undo or redo action.
diff --git a/library/tk.tcl b/library/tk.tcl
index 047ea63..45952be 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -11,7 +11,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 # Verify that we have Tk binary and script components from the same release
-package require -exact Tk  8.7a2
+package require -exact Tk  8.7a3
 
 # Create a ::tk namespace
 namespace eval ::tk {
@@ -687,11 +687,6 @@ if {[tk windowingsystem] eq "aqua"} {
 
 
 if {[tk windowingsystem] eq "aqua"} {
-    #register to send data to macOS Services
-    proc ::tk::RegisterServiceWidget {w} {
-	::tk::mac::registerServiceWidget $w
-    }
-
     #stub procedures to respond to "do script" Apple Events
     proc ::tk::mac::DoScriptFile {file} {
     	source $file
@@ -701,7 +696,10 @@ if {[tk windowingsystem] eq "aqua"} {
     }
 }
 
+# Create a dictionary to store the starting index of the IME marked
+# text in an Entry or Text widget.
 
+set ::tk::Priv(IMETextMark) [dict create]
 
 # Run the Ttk themed widget set initialization
 if {$::ttk::library ne ""} {
diff --git a/library/ttk/aquaTheme.tcl b/library/ttk/aquaTheme.tcl
index 15e13ce..8bba226 100644
--- a/library/ttk/aquaTheme.tcl
+++ b/library/ttk/aquaTheme.tcl
@@ -9,8 +9,8 @@ namespace eval ttk::theme::aqua {
 	    -font TkDefaultFont \
 	    -background systemWindowBackgroundColor \
 	    -foreground systemLabelColor \
-	    -selectbackground systemHighlight \
-	    -selectforeground systemLabelColor \
+	    -selectbackground systemSelectedTextBackgroundColor \
+	    -selectforeground systemSelectedTextColor \
 	    -selectborderwidth 0 \
 	    -insertwidth 1
 
@@ -38,7 +38,18 @@ namespace eval ttk::theme::aqua {
 	# Entry
 	ttk::style configure TEntry \
 	    -foreground systemTextColor \
-	    -background systemTextBackgroundColor \
+	    -background systemTextBackgroundColor
+	ttk::style map TEntry \
+	    -foreground {
+		disabled systemDisabledControlTextColor
+	    } \
+	    -selectforeground {
+		background systemTextColor
+	    } \
+	    -selectbackground {
+		background systemTextBackgroundColor
+	    }
+
 
 	# Workaround for #1100117:
 	# Actually, on Aqua we probably shouldn't stipple images in
@@ -59,20 +70,16 @@ namespace eval ttk::theme::aqua {
 	# Combobox:
 	ttk::style configure TCombobox \
 	    -foreground systemTextColor \
-	    -background systemTransparent \
-	    -selectforeground systemSelectedTextColor \
-	    -selectbackground systemSelectedTextBackgroundColor
+	    -background systemTransparent
 	ttk::style map TCombobox \
 	    -foreground {
 		disabled systemDisabledControlTextColor
 	    } \
 	    -selectforeground {
-		!active systemTextColor
+		background systemTextColor
 	    } \
 	    -selectbackground {
-		!active systemTextBackgroundColor
-		!focus systemTextBackgroundColor
-		focus systemSelectedTextBackgroundColor
+		background systemTransparent
 	    }
 
 	# Spinbox
diff --git a/library/ttk/combobox.tcl b/library/ttk/combobox.tcl
index 1355a04..2770142 100644
--- a/library/ttk/combobox.tcl
+++ b/library/ttk/combobox.tcl
@@ -149,12 +149,14 @@ proc ttk::combobox::Drag {w x}  {
 #	Set cursor.
 #
 proc ttk::combobox::Motion {w x y} {
+    variable State
+    ttk::saveCursor $w State(userConfCursor) [ttk::cursor text]
     if {   [$w identify $x $y] eq "textarea"
         && [$w instate {!readonly !disabled}]
     } {
 	ttk::setCursor $w text
     } else {
-	ttk::setCursor $w ""
+	ttk::setCursor $w $State(userConfCursor)
     }
 }
 
diff --git a/library/ttk/cursors.tcl b/library/ttk/cursors.tcl
index 852f01c..9125acb 100644
--- a/library/ttk/cursors.tcl
+++ b/library/ttk/cursors.tcl
@@ -137,8 +137,30 @@ proc ttk::cursor {name} {
 
 proc ttk::setCursor {w name} {
     variable Cursors
-    if {[$w cget -cursor] ne $Cursors($name)} {
-	$w configure -cursor $Cursors($name)
+    if {[info exists Cursors($name)]} {
+        set cursorname $Cursors($name)
+    }  else {
+        set cursorname $name
+    }
+    if {[$w cget -cursor] ne $cursorname} {
+        $w configure -cursor $cursorname
+    }
+}
+
+## ttk::saveCursor $w $saveVar $excludeList --
+#       Set variable $saveVar to the -cursor value from widget $w,
+#       if either:
+#       a. $saveVar does not yet exist
+#       b. the currently user-specified cursor for $w is not in
+#          $excludeList
+
+proc ttk::saveCursor {w saveVar excludeList} {
+    upvar $saveVar sv
+    if {![info exists sv]} {
+        set sv [$w cget -cursor]
+    }
+    if {[$w cget -cursor] ni $excludeList} {
+        set sv [$w cget -cursor]
     }
 }
 
diff --git a/library/ttk/entry.tcl b/library/ttk/entry.tcl
index 383eebd..45e3506 100644
--- a/library/ttk/entry.tcl
+++ b/library/ttk/entry.tcl
@@ -58,13 +58,6 @@ option add *TEntry.cursor [ttk::cursor text] widgetDefault
 #	and I'll put it back.
 #
 
-##Bindings to register with macOS Services API.
-bind T.Entry <Map> {
-    if {[tk windowingsystem] eq "aqua"} {
-    	::tk::RegisterServiceWidget %W
-    }
-}
-
 ## Clipboard events:
 #
 bind TEntry <<Cut>> 			{ ttk::entry::Cut %W }
@@ -152,6 +145,25 @@ bind TEntry <Control-Key-d>		{ ttk::entry::Delete %W }
 bind TEntry <Control-Key-h>		{ ttk::entry::Backspace %W }
 bind TEntry <Control-Key-k>		{ %W delete insert end }
 
+# Bindings for IME text input.
+
+bind TEntry <<TkStartIMEMarkedText>> {
+    dict set ::tk::Priv(IMETextMark) "%W" [%W index insert]
+}
+bind TEntry <<TkEndIMEMarkedText>> {
+    if { [catch {dict get $::tk::Priv(IMETextMark) "%W"} mark] } {
+	bell
+    } else {
+	%W selection range $mark insert
+    }
+}
+bind TEntry <<TkClearIMEMarkedText>> {
+    %W delete [dict get $::tk::Priv(IMETextMark) "%W"] [%W index insert]
+}
+bind TEntry <<TkAccentBackspace>> {
+    ttk::entry::Backspace %W
+}
+
 ### Clipboard procedures.
 #
 
diff --git a/library/ttk/panedwindow.tcl b/library/ttk/panedwindow.tcl
index a2e073b..ba47003 100644
--- a/library/ttk/panedwindow.tcl
+++ b/library/ttk/panedwindow.tcl
@@ -62,13 +62,22 @@ proc ttk::panedwindow::Release {w x y} {
 #
 proc ttk::panedwindow::ResetCursor {w} {
     variable State
+
+    ttk::saveCursor $w State(userConfCursor) \
+            [list [ttk::cursor hresize] [ttk::cursor vresize]]
+
     if {!$State(pressed)} {
-	ttk::setCursor $w {}
+	ttk::setCursor $w $State(userConfCursor)
     }
 }
 
 proc ttk::panedwindow::SetCursor {w x y} {
-    set cursor ""
+    variable State
+
+    ttk::saveCursor $w State(userConfCursor) \
+            [list [ttk::cursor hresize] [ttk::cursor vresize]]
+
+    set cursor $State(userConfCursor)
     if {[llength [$w identify $x $y]]} {
     	# Assume we're over a sash.
 	switch -- [$w cget -orient] {
diff --git a/library/ttk/spinbox.tcl b/library/ttk/spinbox.tcl
index 90a1572..9728755 100644
--- a/library/ttk/spinbox.tcl
+++ b/library/ttk/spinbox.tcl
@@ -29,12 +29,14 @@ ttk::bindMouseWheel TSpinbox 		[list ttk::spinbox::MouseWheel %W]
 #	Sets cursor.
 #
 proc ttk::spinbox::Motion {w x y} {
+    variable State
+    ttk::saveCursor $w State(userConfCursor) [ttk::cursor text]
     if {   [$w identify $x $y] eq "textarea"
         && [$w instate {!readonly !disabled}]
     } {
 	ttk::setCursor $w text
     } else {
-	ttk::setCursor $w ""
+	ttk::setCursor $w $State(userConfCursor)
     }
 }
 
diff --git a/library/ttk/treeview.tcl b/library/ttk/treeview.tcl
index 1cfb4fe..b1d0f02 100644
--- a/library/ttk/treeview.tcl
+++ b/library/ttk/treeview.tcl
@@ -142,7 +142,11 @@ proc ttk::treeview::Keynav {w dir} {
 #	Sets cursor, active element ...
 #
 proc ttk::treeview::Motion {w x y} {
-    set cursor {}
+    variable State
+
+    ttk::saveCursor $w State(userConfCursor) [ttk::cursor hresize]
+
+    set cursor $State(userConfCursor)
     set activeHeading {}
 
     switch -- [$w identify region $x $y] {
@@ -161,7 +165,17 @@ proc ttk::treeview::ActivateHeading {w heading} {
 
     if {$w != $State(activeWidget) || $heading != $State(activeHeading)} {
 	if {[winfo exists $State(activeWidget)] && $State(activeHeading) != {}} {
-	    $State(activeWidget) heading $State(activeHeading) state !active
+	    # It may happen that $State(activeHeading) no longer corresponds
+	    # to an existing display column. This happens for instance when
+	    # changing -displaycolumns in a bound script when this change
+	    # triggers a <Leave> event. A proc checking if the display column
+	    # $State(activeHeading) is really still present or not could be
+	    # written but it would need to check several special cases:
+	    #   a. -displaycolumns "#all" or being an explicit columns list
+	    #   b. column #0 display is not governed by the -displaycolumn
+	    #      list but by the value of the -show option
+	    # --> Let's rather catch the following line.
+	    catch {$State(activeWidget) heading $State(activeHeading) state !active}
 	}
 	if {$heading != {}} {
 	    $w heading $heading state active
diff --git a/library/ttk/utils.tcl b/library/ttk/utils.tcl
index 857f4cd..05f0a0c 100644
--- a/library/ttk/utils.tcl
+++ b/library/ttk/utils.tcl
@@ -308,7 +308,15 @@ proc ttk::bindMouseWheel {bindtag callback} {
 	bind $bindtag <MouseWheel> [append callback { [expr {-(%D)}]} ]
 	bind $bindtag <Option-MouseWheel> [append callback { [expr {-10 *(%D)}]} ]
     } else {
-	bind $bindtag <MouseWheel> [append callback { [expr {-(%D / 120)}]}]
+	# We must make sure that positive and negative movements are rounded
+	# equally to integers, avoiding the problem that
+	#     (int)1/120 = 0,
+	# but
+	#     (int)-1/120 = -1
+	# The following code ensure equal +/- behaviour.
+	bind $bindtag <MouseWheel> [append callback { [
+	    expr {%D>=0 ? (-%D/120) : ((119-%D)/120)}
+	]}]
     }
 }
 
@@ -327,19 +335,39 @@ if {[tk windowingsystem] eq "x11"} {
     bind TtkScrollable <Shift-ButtonPress-5> { %W xview scroll  5 units }
 }
 if {[tk windowingsystem] eq "aqua"} {
-    bind TtkScrollable <MouseWheel> \
-	    { %W yview scroll [expr {-(%D)}] units }
-    bind TtkScrollable <Shift-MouseWheel> \
-	    { %W xview scroll [expr {-(%D)}] units }
-    bind TtkScrollable <Option-MouseWheel> \
-	    { %W yview scroll  [expr {-10 * (%D)}] units }
-    bind TtkScrollable <Shift-Option-MouseWheel> \
-	    { %W xview scroll [expr {-10 * (%D)}] units }
+    bind TtkScrollable <MouseWheel> {
+	%W yview scroll [expr {-(%D)}] units
+    }
+    bind TtkScrollable <Shift-MouseWheel> {
+	%W xview scroll [expr {-(%D)}] units
+    }
+    bind TtkScrollable <Option-MouseWheel> {
+	%W yview scroll  [expr {-10 * (%D)}] units
+    }
+    bind TtkScrollable <Shift-Option-MouseWheel> {
+	%W xview scroll [expr {-10 * (%D)}] units
+    }
 } else {
-    bind TtkScrollable <MouseWheel> \
-	    { %W yview scroll [expr {-(%D / 120)}] units }
-    bind TtkScrollable <Shift-MouseWheel> \
-	    { %W xview scroll [expr {-(%D / 120)}] units }
+    # We must make sure that positive and negative movements are rounded
+    # equally to integers, avoiding the problem that
+    #     (int)1/120 = 0,
+    # but
+    #     (int)-1/120 = -1
+    # The following code ensure equal +/- behaviour.
+    bind TtkScrollable <MouseWheel> {
+	if {%D >= 0} {
+	    %W yview scroll [expr {-%D/120}] units
+	} else {
+	    %W yview scroll [expr {(119-%D)/120}] units
+	}
+    }
+    bind TtkScrollable <Shift-MouseWheel> {
+	if {%D >= 0} {
+	    %W xview scroll [expr {-%D/120}] units
+	} else {
+	    %W xview scroll [expr {(119-%D)/120}] units
+	}
+    }
 }
 
 #*EOF*
diff --git a/library/ttk/xpTheme.tcl b/library/ttk/xpTheme.tcl
index 4c4f680..da7b422 100644
--- a/library/ttk/xpTheme.tcl
+++ b/library/ttk/xpTheme.tcl
@@ -28,13 +28,6 @@ namespace eval ttk::theme::xpnative {
 	ttk::style map TNotebook.Tab \
 	    -expand [list selected {2 2 2 2}]
 
-	# Treeview:
-	ttk::style configure Heading -font TkHeadingFont
-	ttk::style configure Treeview -background SystemWindow
-	ttk::style map Treeview \
-	    -background [list selected SystemHighlight] \
-	    -foreground [list selected SystemHighlightText] ;
-
 	ttk::style configure TLabelframe.Label -foreground "#0046d5"
 
 	# OR: -padding {3 3 3 6}, which some apps seem to use.