summaryrefslogtreecommitdiffstats
path: root/Mac/Python
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2001-11-01 23:17:35 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2001-11-01 23:17:35 (GMT)
commit95837f1973c0343f33bab0cc0fc98c32856d53e1 (patch)
tree934feb28c8ae226fc60299fee7092fb82f17db38 /Mac/Python
parentd2e40d6691899d5969b68cdf967d7b392b4e6e6b (diff)
downloadcpython-95837f1973c0343f33bab0cc0fc98c32856d53e1.zip
cpython-95837f1973c0343f33bab0cc0fc98c32856d53e1.tar.gz
cpython-95837f1973c0343f33bab0cc0fc98c32856d53e1.tar.bz2
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:-)
Diffstat (limited to 'Mac/Python')
-rw-r--r--Mac/Python/macglue.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
index 4e8c9e4..13dbbe7 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 )