From d49b711771eb01ba6d2cc611c5b828d093c9e2ae Mon Sep 17 00:00:00 2001
From: ben <ben@cda61777-01e9-0310-a592-d414129be87e>
Date: Thu, 27 Feb 2003 23:34:59 +0000
Subject: [PATCH] Handle the Aqua menu layout, in which the system provides a
 "quit" option for us, correctly.

git-svn-id: svn://svn.tartarus.org/sgt/putty@2899 cda61777-01e9-0310-a592-d414129be87e
---
 mac/mac.c | 7 ++++++-
 mac/mac.h | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mac/mac.c b/mac/mac.c
index d8b9b2fa..a9a327f4 100644
--- a/mac/mac.c
+++ b/mac/mac.c
@@ -1,4 +1,4 @@
-/* $Id: mac.c,v 1.51 2003/02/23 11:58:59 ben Exp $ */
+/* $Id: mac.c,v 1.52 2003/02/27 23:34:59 ben Exp $ */
 /*
  * Copyright (c) 1999, 2003 Ben Harris
  * All rights reserved.
@@ -157,6 +157,9 @@ static void mac_startup(void) {
     if (Gestalt(gestaltWindowMgrAttr, &mac_gestalts.windattr) != noErr ||
 	&SetWindowContentColor == kUnresolvedCFragSymbolAddress)
 	mac_gestalts.windattr = 0;
+    /* Mac OS 8.5 Menu Manager? */
+    if (Gestalt(gestaltMenuMgrAttr, &mac_gestalts.menuattr) != noErr)
+	mac_gestalts.menuattr = 0;
 #endif
     /* Text Encoding Conversion Manager? */
     if (
@@ -189,6 +192,8 @@ static void mac_startup(void) {
 	fatalbox("Unable to create menu bar.");
     SetMenuBar(menuBar);
     AppendResMenu(GetMenuHandle(mApple), 'DRVR');
+    if (mac_gestalts.menuattr & gestaltMenuMgrAquaLayoutMask)
+	DeleteMenuItem(GetMenuHandle(mFile), iQuit);
     mac_adjustmenus();
     DrawMenuBar();
     InitCursor();
diff --git a/mac/mac.h b/mac/mac.h
index e18ff742..febce2f3 100644
--- a/mac/mac.h
+++ b/mac/mac.h
@@ -27,6 +27,7 @@ struct mac_gestalts {
     long apprvers;
     long cntlattr;
     long windattr;
+    long menuattr;
     long encvvers; /* TEC version (from TECGetInfo()) */
     long uncvattr; /* Unicode Converter attributes (frem TECGetInfo()) */
     long navsvers; /* Navigation Services version */
-- 
2.11.0