Carbonise. Currently, size tips and copy/paste won't work in Carbon.

[sgt/putty] / mac / mac.c

diff --git a/mac/mac.c b/mac/mac.c
index 34a1d2b..5abc49a 100644 (file)
--- a/mac/mac.c
+++ b/mac/mac.c
@@ -1,4 +1,4 @@
-/* $Id: mac.c,v 1.42 2003/02/01 23:42:30 ben Exp $ */
+/* $Id: mac.c,v 1.44 2003/02/04 00:33:11 ben Exp $ */
 /*
  * Copyright (c) 1999 Ben Harris
  * All rights reserved.
@@ -43,6 +43,7 @@
 #include <DiskInit.h>
 #include <Gestalt.h>
 #include <LowMem.h>
+#include <Navigation.h>
 #include <Resources.h>
 #include <Script.h>
 #include <TextCommon.h>
@@ -175,6 +176,11 @@ static void mac_startup(void) {
        mac_gestalts.uncvattr = (*ti)->tecUnicodeConverterFeatures;
        DisposeHandle((Handle)ti);
     }
+    /* Navigation Services? */
+    if (NavServicesAvailable())
+       mac_gestalts.navsvers = NavLibraryVersion();
+    else
+       mac_gestalts.navsvers = 0;
 
     sk_init();
 
@@ -507,19 +513,19 @@ static void mac_menucommand(long result) {
     window = FrontWindow();
     /* Things which do the same whatever window we're in. */
     switch (menu) {
-#if !TARGET_API_MAC_CARBON
       case mApple:
         switch (item) {
           case iAbout:
            mac_openabout();
             goto done;
+#if !TARGET_API_MAC_CARBON
           default:
             GetMenuItemText(GetMenuHandle(mApple), item, da);
             OpenDeskAcc(da);
             goto done;
+#endif
         }
         break;
-#endif
       case mFile:
         switch (item) {
           case iNew:
@@ -621,7 +627,6 @@ static void mac_zoomwindow(WindowPtr window, short part) {
  * Make the menus look right before the user gets to see them.
  */
 #if TARGET_API_MAC_CARBON
-/* XXX Is this good enough?  What about Carbon on OS 8.1? */
 #define EnableItem EnableMenuItem
 #define DisableItem DisableMenuItem
 #endif