New option to allow SysTabControl32 to be specified in ASCII not Unicode

git-svn-id: svn://svn.tartarus.org/sgt/putty@367 cda61777-01e9-0310-a592-d414129be87e

diff --git a/Makefile b/Makefile
index 82aeeb2..605cf91 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,12 @@
 #  - COMPAT=/DWIN32S_COMPAT
 #      Generates a binary that works (minimally) with Win32s.
 #
+#  - CFL=/DASCIICTLS
+#      Uses ASCII rather than Unicode to specify the tab control in
+#      the resource file. Probably most useful when compiling with
+#      Cygnus/mingw32, whose resource compiler may have less of a
+#      problem with it.
+#
 ##--
 
 CFLAGS = /nologo /W3 /YX /O2 /Yd /D_WINDOWS /DDEBUG /ML /Fd

diff --git a/win_res.rc b/win_res.rc
index 1885728..8db12b8 100644 (file)
--- a/win_res.rc
+++ b/win_res.rc
@@ -30,8 +30,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 +46,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