diff -up tk8.5.3/library/tk.tcl.olde tk8.5.3/library/tk.tcl
--- tk8.5.3/library/tk.tcl.olde	2008-06-30 05:37:37.000000000 +0200
+++ tk8.5.3/library/tk.tcl	2008-07-29 09:19:52.000000000 +0200
@@ -510,7 +510,7 @@ proc ::tk::AmpWidget {class path args} {
 	}
     }
     set result [$class $path {*}$options]
-    if {[string match "*button" $class]} {
+    if {$class eq "button"} {
 	bind $path <<AltUnderlined>> [list $path invoke]
     }
     return $result
@@ -539,8 +539,8 @@ proc ::tk::AmpMenuArgs {widget add type 
 #
 proc ::tk::FindAltKeyTarget {path char} {
     switch -- [winfo class $path] {
-	Button - Label - 
-        TButton - TLabel - TCheckbutton {
+	Button -
+	Label {
 	    if {[string equal -nocase $char \
 		  [string index [$path cget -text] [$path cget -underline]]]} {
 		return $path