diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-11-19 16:54:41 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-11-19 16:54:41 (GMT) |
| commit | f124336e8992c21d46f536a92e03465d5232b4d1 (patch) | |
| tree | 7abee972bbcb96a07d223f0be4d54bb1105edb3a /library/tk.tcl | |
| parent | 04079d1a344fc35bbadaa939c1dab0cb566ff801 (diff) | |
| parent | 0b6e717a44dff02a2ce046473bbe798a8e07d6c9 (diff) | |
| download | tk-f124336e8992c21d46f536a92e03465d5232b4d1.zip tk-f124336e8992c21d46f536a92e03465d5232b4d1.tar.gz tk-f124336e8992c21d46f536a92e03465d5232b4d1.tar.bz2 | |
merge 8.4
Diffstat (limited to 'library/tk.tcl')
| -rw-r--r-- | library/tk.tcl | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/library/tk.tcl b/library/tk.tcl index a09cd9c..87026f6 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -117,7 +117,7 @@ proc ::tk::PlaceWindow {w {place ""} {anchor ""}} { } elseif {$y > ([winfo vrooty $w]+[winfo vrootheight $w]-[winfo reqheight $w])} { set y [expr {[winfo vrooty $w]+[winfo vrootheight $w]-[winfo reqheight $w]}] } - if {$windowingsystem eq "classic" || $windowingsystem eq "aqua"} { + if {$windowingsystem eq "aqua"} { # Avoid the native menu bar which sits on top of everything. if {$y < 22} { set y 22 } } @@ -390,35 +390,15 @@ switch [tk windowingsystem] { event add <<Undo>> <Command-Key-z> event add <<Redo>> <Command-Key-y> } - "classic" { - event add <<Cut>> <Control-Key-x> <Key-F2> - event add <<Copy>> <Control-Key-c> <Key-F3> - event add <<Paste>> <Control-Key-v> <Key-F4> - event add <<PasteSelection>> <ButtonRelease-2> - event add <<Clear>> <Clear> - event add <<Undo>> <Control-Key-z> <Key-F1> - event add <<Redo>> <Control-Key-Z> - } } # ---------------------------------------------------------------------- # Read in files that define all of the class bindings. # ---------------------------------------------------------------------- if {$::tk_library ne ""} { - if {[tk windowingsystem] eq "classic"} { - proc ::tk::SourceLibFile {file} { - if {[catch { - namespace eval :: \ - [list source [file join $::tk_library $file.tcl]] - }]} { - namespace eval :: [list source -rsrc $file] - } - } - } else { proc ::tk::SourceLibFile {file} { namespace eval :: [list source [file join $::tk_library $file.tcl]] } - } namespace eval ::tk { SourceLibFile button SourceLibFile entry |