Borland makefile should now work sanely with the free-beer bcc55

[u/mdw/putty] / win_res.rc

diff --git a/win_res.rc b/win_res.rc
index f453e42..093ffef 100644 (file)
--- a/win_res.rc
+++ b/win_res.rc
@@ -1,4 +1,7 @@
+/* Some compilers, like Borland, don't have winresrc.h */
+#ifndef NO_WINRESRC_H
 #include <winresrc.h>
+#endif
 
 /* Some systems don't define this, so I do it myself if necessary */
 #ifndef TCS_MULTILINE
@@ -30,8 +33,13 @@ BEGIN
     DEFPUSHBUTTON "&Open", IDOK, 86, 199, 44, 14
     PUSHBUTTON "&Cancel", IDCANCEL, 133, 199, 44, 14
     PUSHBUTTON "&About", IDC_ABOUT, 3, 199, 44, 14, NOT WS_TABSTOP
-    CONTROL "", IDC_TAB, L"SysTabControl32", TCS_MULTILINE | WS_TABSTOP,
-       3, 3, 174, 193
+    CONTROL "", IDC_TAB,
+#ifdef ASCIICTLS
+        "SysTabControl32",
+#else
+        L"SysTabControl32",
+#endif
+       TCS_MULTILINE | WS_TABSTOP, 3, 3, 174, 193
 END
 
 IDD_RECONF DIALOG DISCARDABLE 0, 0, 180, 216
@@ -41,8 +49,13 @@ FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON "&Apply", IDOK, 86, 199, 44, 14
     PUSHBUTTON "&Cancel", IDCANCEL, 133, 199, 44, 14
-    CONTROL "", IDC_TAB, L"SysTabControl32", TCS_MULTILINE | WS_TABSTOP,
-       3, 3, 174, 193
+    CONTROL "", IDC_TAB,
+#ifdef ASCIICTLS
+        "SysTabControl32",
+#else
+        L"SysTabControl32",
+#endif
+       TCS_MULTILINE | WS_TABSTOP, 3, 3, 174, 193
 END
 
 IDD_PANEL0 DIALOG DISCARDABLE 6, 30, 168, 163
@@ -220,10 +233,15 @@ IDD_PANEL6 DIALOG DISCARDABLE  6, 30, 168, 163
 STYLE WS_CHILD | WS_VISIBLE
 FONT 8, "MS Sans Serif"
 BEGIN
-    AUTOCHECKBOX "Enable &KOI8-Win1251 translation",
-        IDC6_ENABLEKOIWINXLAT, 13, 14, 135, 10
-    AUTOCHECKBOX "&CAPS LOCK acts as cyrillic switch",
-        IDC6_CAPSLOCKCYR, 13, 30, 136, 10
+    LTEXT "Character set translation:", IDC6_XLATSTATIC, 3, 3, 162, 8
+    AUTORADIOBUTTON "&None",
+       IDC6_NOXLAT, 3, 12, 162, 10, WS_GROUP
+    AUTORADIOBUTTON "&KOI8 / Win-1251",
+       IDC6_KOI8WIN1251, 3, 22, 162, 10
+    AUTORADIOBUTTON "&ISO-8859-2 / Win-1250",
+       IDC6_88592WIN1250, 3, 32, 162, 10
+    AUTOCHECKBOX "CA&PS LOCK acts as cyrillic switch",
+        IDC6_CAPSLOCKCYR, 3, 46, 162, 10
 END
 
 IDD_LOGBOX DIALOG DISCARDABLE 100, 20, 160, 119