From 760858ffc8952fcbe6f9e27c9858d4229b407fd3 Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 18 Jan 2000 18:14:07 +0000 Subject: [PATCH] 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 --- Makefile | 6 ++++++ win_res.rc | 18 ++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 82aeeb2d..605cf91a 100644 --- 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 18857287..8db12b87 100644 --- 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 -- 2.11.0