From 95837f1973c0343f33bab0cc0fc98c32856d53e1 Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Thu, 1 Nov 2001 23:17:35 +0000 Subject: [PATCH] We always install the Sioux menubar, in stead of only when no menubar was installed previously. This fixes bug #476904, but I'm not 100% sure it doesn't break anything else. But if it does I'll notice tomorrow when I try to build GRiNS:-) --- Mac/Python/macglue.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c index 4e8c9e48a6..13dbbe7f34 100644 --- a/Mac/Python/macglue.c +++ b/Mac/Python/macglue.c @@ -720,7 +720,15 @@ PyMac_InitMenuBar() MenuHandle applemenu; if ( sioux_mbar ) return; +#if 0 + /* This code does not seem to work anymore: apparently + ** we now always have a menubar (since MacOS9?). + ** So we simply always setup the Sioux menus here. + */ if ( (sioux_mbar=GetMenuBar()) == NULL ) { +#else + { +#endif /* Sioux menu not installed yet. Do so */ SIOUXSetupMenus(); if ( (sioux_mbar=GetMenuBar()) == NULL ) -- 2.50.0