jcs
/subtext
/amendments
/248
main: Use about(), allow Desk Accessories to work
jcs made amendment 248 about 1 year ago
--- main.c Thu Aug 11 16:44:44 2022
+++ main.c Thu Sep 8 22:57:29 2022
@@ -30,7 +30,7 @@
#include "uthread.h"
#include "util.h"
-MenuHandle file_menu;
+MenuHandle apple_menu, file_menu;
short quitting = 0;
struct db *db = NULL;
struct logger *logger = NULL;
@@ -46,7 +46,6 @@ int
main(void)
{
Handle mbar;
- MenuHandle apple_menu;
EventRecord event;
WindowPtr event_win;
GrafPtr old_port;
@@ -267,15 +266,17 @@ handle_menu(long menu_id)
switch (HiWord(menu_id)) {
case APPLE_MENU_ID:
switch (LoWord(menu_id)) {
- case APPLE_MENU_ABOUT_ID: {
- char *vers_s;
+ case APPLE_MENU_ABOUT_ID:
+ about(PROGRAM_NAME);
+ break;
+ default: {
+ Str255 da;
+ GrafPtr save_port;
- vers_s = xmalloc(100, "vers_s");
- sprintf(vers_s, "%s %s", PROGRAM_NAME, get_version(true));
- note("%s", vers_s);
- xfree(&vers_s);
-
- ret = true;
+ GetItem(apple_menu, LoWord(menu_id), &da);
+ GetPort(&save_port);
+ OpenDeskAcc(da);
+ SetPort(save_port);
break;
}
}