The long-awaited config box revamp! I've taken the whole config box

[u/mdw/putty] / win_res.rc

diff --git a/win_res.rc b/win_res.rc
index 95d0ef9..4c42471 100644 (file)
--- 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
@@ -22,43 +31,30 @@ IDI_CFGICON ICON "puttycfg.ico"
 IDD_ABOUTBOX DIALOG DISCARDABLE 140, 40, 214, 70
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About PuTTY"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON "&Close", IDOK, 160, 52, 48, 14
     PUSHBUTTON "View &Licence", IDA_LICENCE, 6, 52, 70, 14
     PUSHBUTTON "Visit &Web Site", IDA_WEB, 84, 52, 70, 14
     CTEXT "PuTTY", IDA_TEXT1, 10, 6, 194, 8
     CTEXT "", IDA_VERSION, 10, 16, 194, 16
-    CTEXT "\251 1997-2001 Simon Tatham. All rights reserved.",
+    CTEXT "\251 1997-2003 Simon Tatham. All rights reserved.",
           IDA_TEXT2, 10, 34, 194, 16
 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
-END
-
-/* Accelerators used: ac */
-IDD_RECONF DIALOG DISCARDABLE 0, 0, 280, 242
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "PuTTY Reconfiguration"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
-    DEFPUSHBUTTON "&Apply", IDOK, 184, 225, 44, 14
-    PUSHBUTTON "&Cancel", IDCANCEL, 231, 225, 44, 14
 END
 
 /* Accelerators used: co */
 IDD_LOGBOX DIALOG DISCARDABLE 100, 20, 300, 119
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Event Log"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON "&Close", IDOK, 135, 102, 44, 14
     PUSHBUTTON "C&opy", IDN_COPY, 81, 102, 44, 14
@@ -69,15 +65,15 @@ END
 IDD_LICENCEBOX DIALOG DISCARDABLE 50, 50, 226, 255
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Licence"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON "OK", IDOK, 98, 235, 44, 14
 
-    LTEXT "Copyright \251 1997-2001 Simon Tatham", 1000, 10, 10, 206, 8
+    LTEXT "Copyright \251 1997-2003 Simon Tatham", 1000, 10, 10, 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.", 1003, 10, 42, 206, 8
+    LTEXT "Barry, Justin Bradford, Ben Harris, and CORE SDI S.A.", 1003, 10, 42, 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
@@ -102,3 +98,5 @@ BEGIN
     LTEXT "OTHER DEALINGS IN THE SOFTWARE.", 1022, 10, 218, 206, 8
 
 END
+
+1 RT_MANIFEST "putty.mft"