Fixed accelerator clash in the Unix-specific config, since gtkdlg.c

[PuTTY.git] / mac / mac.h

diff --git a/mac/mac.h b/mac/mac.h
index c228d1bd22a08c70937371f0cf283d78ff655a32..07c8513b590e41d4b7a2a6ba8a598ca9e166c30c 100644 (file)
--- a/mac/mac.h
+++ b/mac/mac.h
@@ -27,12 +27,14 @@ 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 */
 };
 
 extern struct mac_gestalts mac_gestalts;
+extern UInt32 sleeptime;
 
 #if TARGET_RT_MAC_CFM
 /* All systems that can use CFM have Color QuickDraw */
@@ -112,10 +114,16 @@ extern Session *sesslist;
 /* PuTTYgen per-window state */
 typedef struct KeyState {
     DialogPtr          box;
+    int collecting_entropy;
+    int entropy_got, entropy_required, entropy_size;
+    unsigned *entropy;
+    ControlHandle      progress;
 } KeyState;
 
 #define mac_windowkey(w)       (((WinInfo *)GetWRefCon(w))->ks)
 
+/* from macmisc.c */
+extern WindowPtr mac_frontwindow(void);
 /* from macdlg.c */
 extern void mac_newsession(void);
 extern void mac_dupsession(void);