When loading a string setting, expect in the same form we would have

[u/mdw/putty] / mac / mac.c

diff --git a/mac/mac.c b/mac/mac.c
index 72b3301..5083cdd 100644 (file)
--- a/mac/mac.c
+++ b/mac/mac.c
@@ -1,4 +1,4 @@
-/* $Id: mac.c,v 1.4 2002/11/24 15:08:52 ben Exp $ */
+/* $Id: mac.c,v 1.6 2002/12/10 01:11:40 ben Exp $ */
 /*
  * Copyright (c) 1999 Ben Harris
  * All rights reserved.
@@ -41,6 +41,7 @@
 #include <DiskInit.h>
 #include <Gestalt.h>
 #include <Resources.h>
+#include <Script.h>
 #include <ToolUtils.h>
 
 #include <assert.h>
@@ -116,6 +117,11 @@ static void mac_startup(void) {
     InitDialogs(nil);
     cold = 0;
     
+    /* Get base system version (only used if there's no better selector) */
+    if (Gestalt(gestaltSystemVersion, &mac_gestalts.sysvers) != noErr ||
+       (mac_gestalts.sysvers & 0xffff) < 0x700)
+       fatalbox("PuTTY requires System 7 or newer");
+    mac_gestalts.sysvers &= 0xffff;
     /* Find out if we've got Color Quickdraw */
     if (Gestalt(gestaltQuickdrawVersion, &mac_gestalts.qdvers) != noErr)
        mac_gestalts.qdvers = gestaltOriginalQD;
@@ -306,11 +312,13 @@ static void mac_updatelicence(WindowPtr window)
 {
     Handle h;
     int len;
+    long fondsize;
 
     SetPort(window);
     BeginUpdate(window);
-    TextFont(applFont);
-    TextSize(9);
+    fondsize = GetScriptVariable(smRoman, smScriptSmallFondSize);
+    TextFont(HiWord(fondsize));
+    TextSize(LoWord(fondsize));
     h = Get1Resource('TEXT', wLicence);
     len = GetResourceSizeOnDisk(h);
     if (h != NULL) {