diff options
| author | dgp <dgp@users.sourceforge.net> | 2024-02-14 19:20:53 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2024-02-14 19:20:53 (GMT) |
| commit | 53fd6ab12c50c4fa944e381ab5a42abfab47ae3e (patch) | |
| tree | 939d8e255854e1e239fbb88a9734cb76b399682e /library | |
| parent | dafa8ea8fa9fe5d143fd60577da7feb0e4be72bb (diff) | |
| parent | ed7e89f24411571343e21f08baeb35984a519c30 (diff) | |
| download | tk-53fd6ab12c50c4fa944e381ab5a42abfab47ae3e.zip tk-53fd6ab12c50c4fa944e381ab5a42abfab47ae3e.tar.gz tk-53fd6ab12c50c4fa944e381ab5a42abfab47ae3e.tar.bz2 | |
merge 8.6
Diffstat (limited to 'library')
| -rw-r--r-- | library/console.tcl | 2 | ||||
| -rw-r--r-- | library/demos/rolodex | 2 | ||||
| -rw-r--r-- | library/demos/widget | 2 | ||||
| -rw-r--r-- | library/ttk/fonts.tcl | 3 |
4 files changed, 3 insertions, 6 deletions
diff --git a/library/console.tcl b/library/console.tcl index 83723f1..d73b2f5 100644 --- a/library/console.tcl +++ b/library/console.tcl @@ -595,7 +595,7 @@ proc ::tk::ConsoleBind {w} { tk::ConsoleInsert %W %A } bind Console <F9> { - eval destroy [winfo child .] + destroy {*}[winfo children .] source -encoding utf-8 [file join $tk_library console.tcl] } if {[tk windowingsystem] eq "aqua"} { diff --git a/library/demos/rolodex b/library/demos/rolodex index 8941570..22952a5 100644 --- a/library/demos/rolodex +++ b/library/demos/rolodex @@ -10,7 +10,7 @@ exec wish "$0" ${1+"$@"} package require Tk -foreach i [winfo child .] { +foreach i [winfo children .] { catch {destroy $i} } diff --git a/library/demos/widget b/library/demos/widget index 13b8d0e..b37c70c 100644 --- a/library/demos/widget +++ b/library/demos/widget @@ -13,7 +13,7 @@ exec wish "$0" ${1+"$@"} package require Tk 8.5 package require msgcat -eval destroy [winfo child .] +destroy {*}[winfo children .] set tk_demoDirectory [file join [pwd] [file dirname [info script]]] ::msgcat::mcload $tk_demoDirectory namespace import ::msgcat::mc diff --git a/library/ttk/fonts.tcl b/library/ttk/fonts.tcl index bf4ccd0..4f735a8 100644 --- a/library/ttk/fonts.tcl +++ b/library/ttk/fonts.tcl @@ -45,9 +45,6 @@ # There does not appear to be any recommendations for fixed-width fonts. # # X11: -# Need a way to tell if Xft is enabled or not. -# For now, assume patch #971980 applied. -# # "Classic" look used Helvetica bold for everything except # for entry widgets, which use Helvetica medium. # Most other toolkits use medium weight for all UI elements, |