The new menu initialization code would also add the SIOUX menus if a (frozen) Python program had installed its own menubar previously. We now guard against this, with a bit of a hack: FrameWork uses the same Menu ID as Sioux, and the init code checks that the text in the menu is "About SIOUX" before replacing it.

jackjansen · jackjansen · commit 52306a780b62 · 2001-12-10T16:08:14.000Z
diff --git a/Mac/Lib/FrameWork.py b/Mac/Lib/FrameWork.py
@@ -30,6 +30,9 @@
 kHighLevelEvent = 23	# Don't know what header file this should come from
 SCROLLBARWIDTH = 16		# Again, not a clue...
 
+# Trick to forestall a set of SIOUX menus being added to our menubar
+SIOUX_APPLEMENU_ID=32000
+
 
 # Map event 'what' field to strings
 eventname = {}
@@ -442,8 +445,9 @@ def close(self):
 		self.bar = None
 		self.menus = None
 	
-	def addmenu(self, title, after = 0):
-		id = self.getnextid()
+	def addmenu(self, title, after = 0, id=None):
+		if id == None:
+			id = self.getnextid()
 		if DEBUG: print 'Newmenu', title, id # XXXX
 		m = NewMenu(id, title)
 		m.InsertMenu(after)
@@ -507,9 +511,9 @@ def dispatch(self, id, item, window, event):
 class Menu:
 	"One menu."
 	
-	def __init__(self, bar, title, after=0):
+	def __init__(self, bar, title, after=0, id=None):
 		self.bar = bar
-		self.id, self.menu = self.bar.addmenu(title, after)
+		self.id, self.menu = self.bar.addmenu(title, after, id)
 		bar.menus[self.id] = self
 		self.items = []
 		self._parent = None
@@ -675,7 +679,7 @@ def SubMenu(menu, label, title=''):
 class AppleMenu(Menu):
 	
 	def __init__(self, bar, abouttext="About me...", aboutcallback=None):
-		Menu.__init__(self, bar, "\024")
+		Menu.__init__(self, bar, "\024", id=SIOUX_APPLEMENU_ID)
 		if MacOS.runtimemodel == 'ppc':
 			self.additem(abouttext, None, aboutcallback)
 			self.addseparator()
diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
@@ -720,6 +720,8 @@ void
 PyMac_InitMenuBar()
 {
 	MenuHandle applemenu;
+	Str255 about_text;
+	static unsigned char about_sioux[] = "\pAbout SIOUX";
 	
 	if ( sioux_mbar ) return;
 #if 0
@@ -737,7 +739,10 @@ PyMac_InitMenuBar()
 			return;
 	}
 	if ( (applemenu=GetMenuHandle(SIOUX_APPLEID)) == NULL ) return;
-	SetMenuItemText(applemenu, 1, "\pAbout Python...");
+	GetMenuItemText(applemenu, 1, about_text);
+	if ( about_text[0] == about_sioux[0] && 
+		strncmp((char *)(about_text+1), (char *)(about_sioux+1), about_text[0]) == 0 )
+		SetMenuItemText(applemenu, 1, "\pAbout Python...");
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -720,6 +720,8 @@ void`
`720`	`720`	`PyMac_InitMenuBar()`
`721`	`721`	`{`
`722`	`722`	`MenuHandle applemenu;`
	`723`	`+ Str255 about_text;`
	`724`	`+ static unsigned char about_sioux[] = "\pAbout SIOUX";`
`723`	`725`
`724`	`726`	`if ( sioux_mbar ) return;`
`725`	`727`	`#if 0`
`@@ -737,7 +739,10 @@ PyMac_InitMenuBar()`
`737`	`739`	`return;`
`738`	`740`	`}`
`739`	`741`	`if ( (applemenu=GetMenuHandle(SIOUX_APPLEID)) == NULL ) return;`
`740`		`- SetMenuItemText(applemenu, 1, "\pAbout Python...");`
	`742`	`+ GetMenuItemText(applemenu, 1, about_text);`
	`743`	`+ if ( about_text[0] == about_sioux[0] &&`
	`744`	`+ strncmp((char )(about_text+1), (char )(about_sioux+1), about_text[0]) == 0 )`
	`745`	`+ SetMenuItemText(applemenu, 1, "\pAbout Python...");`
`741`	`746`	`}`
`742`	`747`
`743`	`748`	`/*`