diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2019-06-16 02:28:34 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2019-06-16 02:28:34 (GMT) |
| commit | 86bfdfb4e4fc5e424f4eb608642a7973d93c3992 (patch) | |
| tree | a07a2b5c1083f81f1af1566af465e5776728e9e5 /library/tk.tcl | |
| parent | 266c86b993b37da2c483b238e67902daa375532f (diff) | |
| download | tk-86bfdfb4e4fc5e424f4eb608642a7973d93c3992.zip tk-86bfdfb4e4fc5e424f4eb608642a7973d93c3992.tar.gz tk-86bfdfb4e4fc5e424f4eb608642a7973d93c3992.tar.bz2 | |
Fix merge conflict in tk.tcl from services branch merge
Diffstat (limited to 'library/tk.tcl')
| -rw-r--r-- | library/tk.tcl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/library/tk.tcl b/library/tk.tcl index 28e9aad..a055e7d 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -676,7 +676,7 @@ proc ::tk::mcmaxamp {args} { return $maxlen } -# For now, turn off the custom mdef proc for the mac: +# For now, turn off the custom mdef proc for the Mac: if {[tk windowingsystem] eq "aqua"} { namespace eval ::tk::mac { @@ -691,7 +691,6 @@ proc ::tk::RegisterServiceWidget {w} { } } - # Run the Ttk themed widget set initialization if {$::ttk::library ne ""} { uplevel \#0 [list source $::ttk::library/ttk.tcl] |