From: Guido van Rossum <guido@python.org>
Date: Mon, 14 Dec 1992 14:52:49 +0000 (+0000)
Subject: Explicitly close menus.  Make '0' mean the last menu item.
X-Git-Tag: v0.9.8~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c5c52583a58e2dbd5000ac7bf59162204ed8eec;p=thirdparty%2FPython%2Fcpython.git

Explicitly close menus.  Make '0' mean the last menu item.
---

diff --git a/Demo/stdwin/ibrowse/ibrowse.py b/Demo/stdwin/ibrowse/ibrowse.py
index 323ff5ab77fd..41574adba70b 100755
--- a/Demo/stdwin/ibrowse/ibrowse.py
+++ b/Demo/stdwin/ibrowse/ibrowse.py
@@ -111,6 +111,8 @@ def makewindow(file, ref):
 	win.last = []
 	win.pat = ''
 	win.dispatch = idispatch
+	win.nodemenu = None
+	win.footmenu = None
 	windows.append(win)
 	imove(win, ref)
 
@@ -213,6 +215,7 @@ def idispatch(event):
 			return
 		if detail in '0123456789':
 			i = eval(detail) - 1
+			if i < 0: i = len(win.menu) + i
 			if 0 <= i < len(win.menu):
 				topic, ref = win.menu[i]
 				imove(win, ref)
@@ -500,6 +503,8 @@ def imove(win, ref):
 	(left, top), (right, bottom) = win.textobj.getrect()
 	win.setdocsize(0, bottom)
 	#
+	if win.footmenu: win.footmenu.close()
+	if win.nodemenu: win.nodemenu.close()
 	win.footmenu = None
 	win.nodemenu = None
 	#