diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-09-05 09:50:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-09-05 09:50:26 (GMT) |
| commit | ae84e074cd4744336abb1863090bba67da69cc88 (patch) | |
| tree | 002fc7805f685bc5d57a3e3bb7d366c8d6f5adee /library | |
| parent | 1d636d50772a287e852254d23d881c6af3c7a232 (diff) | |
| parent | 3ae2f1e48ac41f837bb7fc64483b81334fd23171 (diff) | |
| download | tk-ae84e074cd4744336abb1863090bba67da69cc88.zip tk-ae84e074cd4744336abb1863090bba67da69cc88.tar.gz tk-ae84e074cd4744336abb1863090bba67da69cc88.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 70e8cfd..a29af4b 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." @@ -183,5 +182,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 53c71a9..75ac9c0 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -684,15 +684,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} { |