Import Tk 8.6.11
This commit is contained in:
@@ -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.6.10
|
||||
package require -exact Tk 8.6.11
|
||||
|
||||
# Create a ::tk namespace
|
||||
namespace eval ::tk {
|
||||
@@ -400,7 +400,7 @@ switch -exact -- [tk windowingsystem] {
|
||||
event add <<NextPara>> <Control-Down>
|
||||
event add <<SelectPrevPara>> <Control-Shift-Up>
|
||||
event add <<SelectNextPara>> <Control-Shift-Down>
|
||||
event add <<ToggleSelection>> <Control-ButtonPress-1>
|
||||
event add <<ToggleSelection>> <Control-Button-1>
|
||||
|
||||
# Some OS's define a goofy (as in, not <Shift-Tab>) keysym that is
|
||||
# returned when the user presses <Shift-Tab>. In order for tab
|
||||
@@ -449,7 +449,7 @@ switch -exact -- [tk windowingsystem] {
|
||||
event add <<NextPara>> <Control-Down>
|
||||
event add <<SelectPrevPara>> <Control-Shift-Up>
|
||||
event add <<SelectNextPara>> <Control-Shift-Down>
|
||||
event add <<ToggleSelection>> <Control-ButtonPress-1>
|
||||
event add <<ToggleSelection>> <Control-Button-1>
|
||||
}
|
||||
"aqua" {
|
||||
event add <<Cut>> <Command-Key-x> <Key-F2> <Command-Lock-Key-X>
|
||||
@@ -462,8 +462,6 @@ switch -exact -- [tk windowingsystem] {
|
||||
# Official bindings
|
||||
# See http://support.apple.com/kb/HT1343
|
||||
event add <<SelectAll>> <Command-Key-a>
|
||||
#Attach function keys not otherwise assigned to this event so they no-op - workaround for bug 0e6930dfe7
|
||||
event add <<SelectNone>> <Option-Command-Key-a> <Key-F5> <Key-F1> <Key-F5> <Key-F6> <Key-F7> <Key-F8> <Key-F9> <Key-F10> <Key-F11> <Key-F12>
|
||||
event add <<Undo>> <Command-Key-z> <Command-Lock-Key-Z>
|
||||
event add <<Redo>> <Shift-Command-Key-z> <Shift-Command-Lock-Key-z>
|
||||
event add <<NextChar>> <Right> <Control-Key-f> <Control-Lock-Key-F>
|
||||
@@ -488,7 +486,7 @@ switch -exact -- [tk windowingsystem] {
|
||||
event add <<NextPara>> <Option-Down>
|
||||
event add <<SelectPrevPara>> <Shift-Option-Up>
|
||||
event add <<SelectNextPara>> <Shift-Option-Down>
|
||||
event add <<ToggleSelection>> <Command-ButtonPress-1>
|
||||
event add <<ToggleSelection>> <Command-Button-1>
|
||||
}
|
||||
}
|
||||
|
||||
@@ -498,7 +496,7 @@ switch -exact -- [tk windowingsystem] {
|
||||
|
||||
if {$::tk_library ne ""} {
|
||||
proc ::tk::SourceLibFile {file} {
|
||||
namespace eval :: [list source [file join $::tk_library $file.tcl]]
|
||||
namespace eval :: [list source -encoding utf-8 [file join $::tk_library $file.tcl]]
|
||||
}
|
||||
namespace eval ::tk {
|
||||
SourceLibFile icons
|
||||
@@ -689,9 +687,11 @@ if {[tk windowingsystem] eq "aqua"} {
|
||||
if {[tk windowingsystem] eq "aqua"} {
|
||||
#stub procedures to respond to "do script" Apple Events
|
||||
proc ::tk::mac::DoScriptFile {file} {
|
||||
source $file
|
||||
uplevel #0 $file
|
||||
source -encoding utf-8 $file
|
||||
}
|
||||
proc ::tk::mac::DoScriptText {script} {
|
||||
uplevel #0 $script
|
||||
eval $script
|
||||
}
|
||||
}
|
||||
@@ -703,7 +703,7 @@ set ::tk::Priv(IMETextMark) [dict create]
|
||||
|
||||
# Run the Ttk themed widget set initialization
|
||||
if {$::ttk::library ne ""} {
|
||||
uplevel \#0 [list source $::ttk::library/ttk.tcl]
|
||||
uplevel \#0 [list source -encoding utf-8 $::ttk::library/ttk.tcl]
|
||||
}
|
||||
|
||||
# Local Variables:
|
||||
|
||||
Reference in New Issue
Block a user