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:-)

diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
index 4e8c9e48a62e41d9e7295656b3f77b8f769abb41..13dbbe7f344ed07c329c0b8bd0379550d33b58ea 100644 (file)
--- 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 )