X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/538bfd1db93a9aac6c2bb52382bb7900042de092..1d009ae71b849a95c86c3117d1b8f063fda8aae5:/mac/mac.c?ds=sidebyside

diff --git a/mac/mac.c b/mac/mac.c
index ed73070a..1552c2fe 100644
--- a/mac/mac.c
+++ b/mac/mac.c
@@ -1,4 +1,4 @@
-/* $Id: mac.c,v 1.54 2003/03/06 23:44:47 ben Exp $ */
+/* $Id: mac.c,v 1.56 2003/03/25 23:18:59 ben Exp $ */
 /*
  * Copyright (c) 1999, 2003 Ben Harris
  * All rights reserved.
@@ -31,6 +31,7 @@
 #include <MacTypes.h>
 #include <AEDataModel.h>
 #include <AppleEvents.h>
+#include <Controls.h>
 #include <Quickdraw.h>
 #include <Fonts.h>
 #include <MacWindows.h>
@@ -194,8 +195,11 @@ static void mac_startup(void) {
 	fatalbox("Unable to create menu bar.");
     SetMenuBar(menuBar);
     AppendResMenu(GetMenuHandle(mApple), 'DRVR');
-    if (mac_gestalts.menuattr & gestaltMenuMgrAquaLayoutMask)
+    if (mac_gestalts.menuattr & gestaltMenuMgrAquaLayoutMask) {
 	DeleteMenuItem(GetMenuHandle(mFile), iQuit);
+	/* Also delete the separator above the Quit item. */
+	DeleteMenuItem(GetMenuHandle(mFile), iQuit - 1);
+    }
     mac_adjustmenus();
     DrawMenuBar();
     InitCursor();
@@ -266,6 +270,8 @@ static void mac_eventloop(void) {
 	sk_poll();
 	if (!gotevent)
 	    mac_pollterm();
+	if (mac_gestalts.apprvers >= 0x100 && mac_frontwindow() != NULL)
+	    IdleControls(mac_frontwindow());
     }
     DisposeRgn(cursrgn);
 }