X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/96f3c4a0baaa9231f6e28f742b64b6d7e5856d8c..9a3a93a5c6a879994d61da8a146142a6555fd5d0:/win_res.rc

diff --git a/win_res.rc b/win_res.rc
index 57e93cf4..c35bc8e2 100644
--- a/win_res.rc
+++ b/win_res.rc
@@ -1,6 +1,10 @@
 /* Some compilers, like Borland, don't have winresrc.h */
 #ifndef NO_WINRESRC_H
+#ifndef MSVC4
 #include <winresrc.h>
+#else
+#include <winres.h>
+#endif
 #endif
 
 /* Some systems don't define this, so I do it myself if necessary */
@@ -8,6 +12,11 @@
 #define TCS_MULTILINE 0x0200
 #endif
 
+/* Likewise */
+#ifndef RT_MANIFEST
+#define RT_MANIFEST 24
+#endif
+
 #ifdef MINGW32_FIX
 #define EDITTEXT     EDITTEXT "",
 #endif
@@ -34,24 +43,25 @@ BEGIN
 END
 
 /* Accelerators used: aco */
-IDD_MAINBOX DIALOG DISCARDABLE 0, 0, 280, 242
+IDD_MAINBOX DIALOG DISCARDABLE 0, 0, 280, 252
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Configuration"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON "&Open", IDOK, 184, 225, 44, 14
-    PUSHBUTTON "&Cancel", IDCANCEL, 231, 225, 44, 14
-    PUSHBUTTON "&About", IDC_ABOUT, 3, 225, 44, 14, NOT WS_TABSTOP
+    DEFPUSHBUTTON "&Open", IDOK, 184, 235, 44, 14
+    PUSHBUTTON "&Cancel", IDCANCEL, 231, 235, 44, 14
+    PUSHBUTTON "&About", IDC_ABOUT, 3, 235, 44, 14, NOT WS_TABSTOP
+    PUSHBUTTON "&Help", IDC_HELPBTN, 50, 235, 44, 14, NOT WS_TABSTOP
 END
 
 /* Accelerators used: ac */
-IDD_RECONF DIALOG DISCARDABLE 0, 0, 280, 242
+IDD_RECONF DIALOG DISCARDABLE 0, 0, 280, 252
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Reconfiguration"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON "&Apply", IDOK, 184, 225, 44, 14
-    PUSHBUTTON "&Cancel", IDCANCEL, 231, 225, 44, 14
+    DEFPUSHBUTTON "&Apply", IDOK, 184, 235, 44, 14
+    PUSHBUTTON "&Cancel", IDCANCEL, 231, 235, 44, 14
 END
 
 /* Accelerators used: co */
@@ -75,20 +85,20 @@ BEGIN
 
     LTEXT "Copyright \251 1997-2001 Simon Tatham", 1000, 10, 10, 206, 8
 
-    LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1002, 10, 26, 206, 8
-    LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1003, 10, 34, 206, 8
-    LTEXT "Barry.", 1003, 10, 42, 206, 8
+    LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8
+    LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8
+    LTEXT "Barry, and CORE SDI S.A.", 1003, 10, 42, 206, 8
 
-    LTEXT "Permission is hereby granted, free of charge, to any person", 1002, 10, 58, 206, 8
-    LTEXT "obtaining a copy of this software and associated documentation", 1003, 10, 66, 206, 8
-    LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1004, 10, 74, 206, 8
-    LTEXT "including without limitation the rights to use, copy, modify, merge,", 1005, 10, 82, 206, 8
-    LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1006, 10, 90, 206, 8
-    LTEXT "and to permit persons to whom the Software is furnished to do so,", 1007, 10, 98, 206, 8
-    LTEXT "subject to the following conditions:", 1008, 10, 106, 206, 8
+    LTEXT "Permission is hereby granted, free of charge, to any person", 1004, 10, 58, 206, 8
+    LTEXT "obtaining a copy of this software and associated documentation", 1005, 10, 66, 206, 8
+    LTEXT "files (the ""Software""), to deal in the Software without restriction,", 1006, 10, 74, 206, 8
+    LTEXT "including without limitation the rights to use, copy, modify, merge,", 1007, 10, 82, 206, 8
+    LTEXT "publish, distribute, sublicense, and/or sell copies of the Software,", 1008, 10, 90, 206, 8
+    LTEXT "and to permit persons to whom the Software is furnished to do so,", 1009, 10, 98, 206, 8
+    LTEXT "subject to the following conditions:", 1010, 10, 106, 206, 8
 
-    LTEXT "The above copyright notice and this permission notice shall be", 1010, 10, 122, 206, 8
-    LTEXT "included in all copies or substantial portions of the Software.", 1011, 10, 130, 206, 8
+    LTEXT "The above copyright notice and this permission notice shall be", 1011, 10, 122, 206, 8
+    LTEXT "included in all copies or substantial portions of the Software.", 1012, 10, 130, 206, 8
 
     LTEXT "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT", 1013, 10, 146, 206, 8
     LTEXT "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,", 1014, 10, 154, 206, 8
@@ -102,3 +112,5 @@ BEGIN
     LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1022, 10, 218, 206, 8
 
 END
+
+1 RT_MANIFEST "putty.mft"