The WinSock library is now loaded at run-time, which means we can

[u/mdw/putty] / mac / macpgen.r

diff --git a/mac/macpgen.r b/mac/macpgen.r
index 036b14f..11bea8d 100644 (file)
--- a/mac/macpgen.r
+++ b/mac/macpgen.r
@@ -1,6 +1,6 @@
-/* $Id: macpgen.r,v 1.3 2003/02/16 14:27:37 ben Exp $ */
+/* $Id: macpgen.r,v 1.6 2003/02/27 23:21:23 ben Exp $ */
 /*
- * Copyright (c) 1999, 2002 Ben Harris
+ * Copyright (c) 1999, 2002, 2003 Ben Harris
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person
@@ -58,10 +58,10 @@ resource 'pGen' (0, purgeable) {
 
 resource 'SIZE' (-1) {
     reserved,
-    ignoreSuspendResumeEvents,
+    acceptSuspendResumeEvents,
     reserved,
     canBackground,
-    needsActivateOnFGSwitch,
+    doesActivateOnFGSwitch,
     backgroundAndForeground,
     dontGetFrontClicks,
     ignoreAppDiedEvents,
@@ -111,6 +111,36 @@ resource 'kind' (129) {
     }
 };
 
+#if TARGET_API_MAC_CARBON
+/*
+ * Mac OS X Info.plist.
+ * See Tech Note TN2013 for details.
+ * We don't bother with things that Mac OS X seems to be able to get from
+ * other resources.
+ */
+type 'plst' as 'TEXT';
+
+resource 'plst' (0) {
+    "<?xml version='1.0' encoding='UTF-8'?>\n"
+    "<!DOCTYPE plist PUBLIC '-//Apple Computer//DTD PLIST 1.0//EN'\n"
+    " 'http://www.apple.com/DTDs/PropertyList-1.0.dtd'>\n"
+    "<plist version='1.0'>\n"
+    "  <dict>\n"
+    "    <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>\n"
+    "    <key>CFBundleIdentifier</key>\n"
+    "      <string>org.tartarus.projects.putty.puttygen</string>\n"
+    "    <key>CFBundleName</key>                  <string>PuTTYgen</string>\n"
+    "    <key>CFBundlePackageType</key>           <string>APPL</string>\n"
+    "    <key>CFBundleSignature</key>             <string>pGen</string>\n"
+    "  </dict>\n"
+    "</plist>\n"
+};
+
+/* Mac OS X doesn't use this, but Mac OS 9 does. */
+type 'carb' as 'TEXT';
+resource 'carb' (0) { "" };
+#endif
+
 /* Icons, courtesy of DeRez */
 
 /* Random seed icon */
@@ -460,10 +490,19 @@ resource 'dlgx' (wKey, "key", purgeable) {
     }
 };
 
+#define cProgress 129
+
 resource 'DITL' (wKey, "key", purgeable) {
     {
        { 13, 13, 33, 227 },
        Button { enabled, "Generate" },
+       { 46, 13, 12, 227 },
+       Control { enabled, cProgress },
     }
 };
 
+resource 'CNTL' (cProgress) {
+    { 46, 13, 12, 227 },
+    0, visible, 0, 0,
+    kControlProgressBarProc, 0, ""
+};
\ No newline at end of file