diff options
| author | dgp <dgp@users.sourceforge.net> | 2022-09-07 14:41:02 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2022-09-07 14:41:02 (GMT) |
| commit | 2812e5724c18c39bbb119d177461be9ca539ee2e (patch) | |
| tree | 0b73014aceb7b8054e28a98b73f554cccadc8810 /library | |
| parent | 915ead721473ffb805a3db51594969de7205f77b (diff) | |
| parent | ea9ae2f75bd7c14f819ef221d946ea79efa403bb (diff) | |
| download | tk-2812e5724c18c39bbb119d177461be9ca539ee2e.zip tk-2812e5724c18c39bbb119d177461be9ca539ee2e.tar.gz tk-2812e5724c18c39bbb119d177461be9ca539ee2e.tar.bz2 | |
merge 8.6
Diffstat (limited to 'library')
| -rw-r--r-- | library/demos/menu.tcl | 3 | ||||
| -rw-r--r-- | library/demos/menubu.tcl | 3 | ||||
| -rw-r--r-- | library/tk.tcl | 9 |
3 files changed, 0 insertions, 15 deletions
diff --git a/library/demos/menu.tcl b/library/demos/menu.tcl index 244361d..dc5ce9b 100644 --- a/library/demos/menu.tcl +++ b/library/demos/menu.tcl @@ -18,7 +18,6 @@ positionWindow $w label $w.msg -font $font -wraplength 4i -justify left if {[tk windowingsystem] eq "aqua"} { - catch {set origUseCustomMDEF $::tk::mac::useCustomMDEF; set ::tk::mac::useCustomMDEF 1} $w.msg configure -text "This window has a menubar with cascaded menus. You can invoke entries with an accelerator by typing Command+x, where \"x\" is the character next to the command key symbol. The rightmost menu can be torn off into a palette by selecting the first item in the menu." } else { $w.msg configure -text "This window contains a menubar with cascaded menus. You can post a menu from the keyboard by typing Alt+x, where \"x\" is the character underlined on the menu. You can then traverse among the menus using the arrow keys. When a menu is posted, you can invoke the current entry by typing space, or you can invoke any entry by typing its underlined character. If a menu entry has an accelerator, you can invoke the entry without posting the menu just by typing the accelerator. The rightmost menu can be torn off into a palette by selecting the first item in the menu." @@ -176,5 +175,3 @@ bind Menu <<MenuSelect>> { set menustatus $label update idletasks } - -if {[tk windowingsystem] eq "aqua"} {catch {set ::tk::mac::useCustomMDEF $origUseCustomMDEF}} diff --git a/library/demos/menubu.tcl b/library/demos/menubu.tcl index 96e3b15..453b05c 100644 --- a/library/demos/menubu.tcl +++ b/library/demos/menubu.tcl @@ -18,7 +18,6 @@ positionWindow $w frame $w.body pack $w.body -expand 1 -fill both -if {[tk windowingsystem] eq "aqua"} {catch {set origUseCustomMDEF $::tk::mac::useCustomMDEF; set ::tk::mac::useCustomMDEF 1}} menubutton $w.body.below -text "Below" -underline 0 -direction below -menu $w.body.below.m -relief raised menu $w.body.below.m -tearoff 0 @@ -86,5 +85,3 @@ foreach i {Black gray75 gray50 White} { } pack $body.buttons.colors -side left -padx 25 -pady 25 - -if {[tk windowingsystem] eq "aqua"} {catch {set ::tk::mac::useCustomMDEF $origUseCustomMDEF}} diff --git a/library/tk.tcl b/library/tk.tcl index d7d7211..89267d6 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -675,15 +675,6 @@ proc ::tk::mcmaxamp {args} { return $maxlen } -# For now, turn off the custom mdef proc for the Mac: - -if {[tk windowingsystem] eq "aqua"} { - namespace eval ::tk::mac { - set useCustomMDEF 0 - } -} - - if {[tk windowingsystem] eq "aqua"} { #stub procedures to respond to "do script" Apple Events proc ::tk::mac::DoScriptFile {file} { |