Python about box implemented. Slightly convoluted, since (a) we have

jackjansen · jackjansen · commit 3469e997b4ca · 1996-09-06T00:30:45.000Z
to override an internal sioux routine and (b) we have to override the
"about sioux" menuitem after sioux has created its menus.
diff --git a/Mac/Include/macglue.h b/Mac/Include/macglue.h
@@ -63,6 +63,8 @@ PyObject *PyErr_Mac(PyObject *, int);		/* Exception with a mac error */
 PyObject *PyMac_Error(OSErr);			/* Uses PyMac_GetOSErrException */
 void PyMac_HandleEvent Py_PROTO((EventRecord *)); /* Handle one event, if possible */
 
+void PyMac_InitMenuBar(void);			/* Setup menu bar as we want it */
+
 int PyMac_FindResourceModule(char *, char *); /* Test for 'PYC ' resource in a file */
 PyObject * PyMac_LoadResourceModule(char *, char *); /* Load 'PYC ' resource from file */
 
diff --git a/Mac/Include/pythonresources.h b/Mac/Include/pythonresources.h
@@ -56,6 +56,9 @@
 /* Dialog for 'Bad preference file' */
 #define BADPREFFILE_ID	135
 
+/* About box */
+#define ABOUT_ID		136
+
 /*
 ** The following are valid both in the binary (or shared library)
 ** and in the Preferences file.
@@ -83,6 +86,9 @@
 #define POPT_KEEPNORM	5
 #define POPT_KEEPERR	6
 
+/* Our menu bar */
+#define MENUBAR_ID 128
+
 /* From macgetpath.c: */
 void PyMac_PreferenceOptions Py_PROTO((int *inspect, int *verbose, int *suppress_print, 
 						 int *unbuffered, int *debugging, int *keep_normal,
diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
@@ -68,6 +68,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <GUSI.h>
 #endif
 
+/* The ID of the Sioux apple menu */
+#define SIOUX_APPLEID	32000
+
 #ifndef HAVE_UNIVERSAL_HEADERS
 #define GetResourceSizeOnDisk(x) SizeResource(x)
 typedef DlgHookYDProcPtr DlgHookYDUPP;
@@ -517,6 +520,35 @@ PyMac_Idle()
 }
 #endif
 
+/*
+** Install our menu bar.
+*/
+void
+PyMac_InitMenuBar()
+{
+	Handle bar;
+	MenuHandle applemenu;
+	
+	if ( (bar=GetMenuBar()) == NULL ) return;
+	if ( (applemenu=GetMHandle(SIOUX_APPLEID)) == NULL ) return;
+	SetMenuItemText(applemenu, 1, "\pAbout Python...");
+}
+
+/*
+** Our replacement about box
+*/
+void
+SIOUXDoAboutBox(void)
+{
+	DialogPtr theDialog;
+	short item;
+	
+	if( (theDialog = GetNewDialog(ABOUT_ID, NULL, (WindowPtr)-1)) == NULL )
+		return;
+	ModalDialog(NULL, &item);
+	DisposeDialog(theDialog);
+}
+
 /*
 ** Returns true if the argument has a resource fork, and it contains
 ** a 'PYC ' resource of the correct name
diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c
@@ -351,6 +351,12 @@ Py_Main(argc, argv)
 		}
 	}
 	
+	/*
+	** For reasons I don't fully understand we cannot insert our
+	** menu earlier. Leave it here, we hope to be rid of Sioux soon anyway.
+	*/
+	PyMac_InitMenuBar();
+	
 	Py_Initialize();
 	
 	PySys_SetArgv(argc-1, argv+1);
diff --git a/Mac/Resources/dialogs.rsrc.hqx b/Mac/Resources/dialogs.rsrc.hqx

Original file line number	Diff line number	Diff line change
`@@ -351,6 +351,12 @@ Py_Main(argc, argv)`
`351`	`351`	`}`
`352`	`352`	`}`
`353`	`353`
	`354`	`+ /*`
	`355`	`+ ** For reasons I don't fully understand we cannot insert our`
	`356`	`+ ** menu earlier. Leave it here, we hope to be rid of Sioux soon anyway.`
	`357`	`+ */`
	`358`	`+ PyMac_InitMenuBar();`
	`359`	`+`
`354`	`360`	`Py_Initialize();`
`355`	`361`
`356`	`362`	`PySys_SetArgv(argc-1, argv+1);`