diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2015-07-30 20:44:41 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2015-07-30 20:44:41 (GMT) |
| commit | 659fcb0a8dd1c3733c609406522d95aa663f2eaa (patch) | |
| tree | d88c49ca8716758373388687937a01f295e10d4b /Lib/idlelib | |
| parent | b465cb50de6e11ce2399cb8c1f2811054ce135c8 (diff) | |
| parent | 30f1f67248260b10eb16a3e630c6cf5c7e29fad2 (diff) | |
| download | cpython-659fcb0a8dd1c3733c609406522d95aa663f2eaa.zip cpython-659fcb0a8dd1c3733c609406522d95aa663f2eaa.tar.gz cpython-659fcb0a8dd1c3733c609406522d95aa663f2eaa.tar.bz2 | |
Merge with 3.4
Diffstat (limited to 'Lib/idlelib')
| -rw-r--r-- | Lib/idlelib/EditorWindow.py | 7 | ||||
| -rw-r--r-- | Lib/idlelib/help.txt | 4 | ||||
| -rw-r--r-- | Lib/idlelib/macosxSupport.py | 5 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index ef35ffe..7bc2aa7 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -447,14 +447,15 @@ class EditorWindow(object): self.menudict = menudict = {} for name, label in self.menu_specs: underline, label = prepstr(label) - menudict[name] = menu = Menu(mbar, name=name) + menudict[name] = menu = Menu(mbar, name=name, tearoff=0) mbar.add_cascade(label=label, menu=menu, underline=underline) if macosxSupport.isCarbonTk(): # Insert the application menu - menudict['application'] = menu = Menu(mbar, name='apple') + menudict['application'] = menu = Menu(mbar, name='apple', + tearoff=0) mbar.add_cascade(label='IDLE', menu=menu) self.fill_menus() - self.recent_files_menu = Menu(self.menubar) + self.recent_files_menu = Menu(self.menubar, tearoff=0) self.menudict['file'].insert_cascade(3, label='Recent Files', underline=0, menu=self.recent_files_menu) diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt index 9540173..3f7bb23 100644 --- a/Lib/idlelib/help.txt +++ b/Lib/idlelib/help.txt @@ -15,9 +15,7 @@ Menus: IDLE has two window types the Shell window and the Editor window. It is possible to have multiple editor windows simultaneously. IDLE's menus dynamically change based on which window is currently selected. Each menu -documented below indicates which window type it is associated with. Click on -the dotted line at the top of a menu to "tear it off": a separate window -containing the menu is created (for Unix and Windows only). +documented below indicates which window type it is associated with. File Menu (Shell and Editor): diff --git a/Lib/idlelib/macosxSupport.py b/Lib/idlelib/macosxSupport.py index 5813749..77330cf 100644 --- a/Lib/idlelib/macosxSupport.py +++ b/Lib/idlelib/macosxSupport.py @@ -145,7 +145,7 @@ def overrideRootMenu(root, flist): root.configure(menu=menubar) menudict = {} - menudict['windows'] = menu = Menu(menubar, name='windows') + menudict['windows'] = menu = Menu(menubar, name='windows', tearoff=0) menubar.add_cascade(label='Window', menu=menu, underline=0) def postwindowsmenu(menu=menu): @@ -191,7 +191,8 @@ def overrideRootMenu(root, flist): if isCarbonTk(): # for Carbon AquaTk, replace the default Tk apple menu - menudict['application'] = menu = Menu(menubar, name='apple') + menudict['application'] = menu = Menu(menubar, name='apple', + tearoff=0) menubar.add_cascade(label='IDLE', menu=menu) Bindings.menudefs.insert(0, ('application', [ |