From 4ae9901aa2f631ac42deb3d94991a0ab9ec51664 Mon Sep 17 00:00:00 2001 From: patthoyts Date: Sun, 11 May 2008 00:44:07 +0000 Subject: Support for ttk widgets in AmpWidget --- ChangeLog | 2 ++ library/tk.tcl | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 89c42a2..db99f69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2008-05-11 Pat Thoyts + * library/tk.tcl: Support for ttk widgets in AmpWidget + * doc/button.n: Note negative widths for button [Patch #1883418] * doc/ttk_*: 'identify' widget command is on all ttk widgets. diff --git a/library/tk.tcl b/library/tk.tcl index f675263..23b5b93 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -3,7 +3,7 @@ # Initialization script normally executed in the interpreter for each # Tk-based application. Arranges class bindings for widgets. # -# RCS: @(#) $Id: tk.tcl,v 1.73.2.1 2008/04/11 19:00:48 dgp Exp $ +# RCS: @(#) $Id: tk.tcl,v 1.73.2.2 2008/05/11 00:44:07 patthoyts Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -355,7 +355,7 @@ if {![llength [info command tk_chooseDirectory]]} { # Define the set of common virtual events. #---------------------------------------------------------------------- -switch -- [tk windowingsystem] { +switch -exact -- [tk windowingsystem] { "x11" { event add <> event add <> @@ -510,7 +510,7 @@ proc ::tk::AmpWidget {class path args} { } } set result [$class $path {*}$options] - if {$class eq "button"} { + if {[string match "*button" $class]} { bind $path <> [list $path invoke] } return $result @@ -539,8 +539,8 @@ proc ::tk::AmpMenuArgs {widget add type args} { # proc ::tk::FindAltKeyTarget {path char} { switch -- [winfo class $path] { - Button - - Label { + Button - Label - + TButton - TLabel - TCheckbutton { if {[string equal -nocase $char \ [string index [$path cget -text] [$path cget -underline]]]} { return $path -- cgit v0.12