X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/937973abb24d92b9e0082e2d8d2eda5a4eb765d3..9d33ebddc777e92a92d57f91a9d7f325d36aa422:/win_res.inp

diff --git a/win_res.inp b/win_res.inp
index ed904969..3440f9f7 100644
--- a/win_res.inp
+++ b/win_res.inp
@@ -8,6 +8,10 @@
 #define TCS_MULTILINE 0x0200
 #endif
 
+#ifdef MINGW32_FIX
+#define EDITTEXT     EDITTEXT "",
+#endif
+
 #include "win_res.h"
 
 IDI_MAINICON ICON "putty.ico"
@@ -69,9 +73,9 @@ INIT(0,176,4,162) SPOS(3,3)
 BEGIN
     GRID(4,4,24)
     LTEXT "Host &Name", IDC0_HOSTSTATIC, COL(1), SS(3,2)
-    EDITTEXT "", IDC0_HOST, ADJ(8) COL(1), SS(3,3), ES_AUTOHSCROLL
+    EDITTEXT IDC0_HOST, ADJ(8) COL(1), SS(3,3), ES_AUTOHSCROLL
     LTEXT "&Port", IDC0_PORTSTATIC, COL(4), SS(1,2)
-    EDITTEXT "", IDC0_PORT, ADJ(8) COL(4), SS(1,3)
+    EDITTEXT IDC0_PORT, ADJ(8) COL(4), SS(1,3)
     NEXT
     GRID(4,8,10)
 #ifdef FWHACK
@@ -91,7 +95,7 @@ BEGIN
     GRID(1,8,8)
     LTEXT "Stor&ed Sessions", IDC0_SESSSTATIC, SCOL
     GRID(4,12,14)
-    EDITTEXT "", IDC0_SESSEDIT, COL(1), SS(3), ES_AUTOHSCROLL
+    EDITTEXT IDC0_SESSEDIT, COL(1), SS(3), ES_AUTOHSCROLL
     NEXT
     GRID(4,71,0)
     LISTBOX IDC0_SESSLIST, COL(1), SS(3),
@@ -141,7 +145,7 @@ BEGIN
     AUTOCHECKBOX "Reset scrollback on &keypress", IDC1_SCROLLKEY, SCOL
 END
 
-/* Accelerators used: [aco] bdghiklmnprswy */
+/* Accelerators used: [aco] dghlmnprsw */
 IDD_PANEL2 DIALOG DISCARDABLE 6, 30, 168, 163
 STYLE WS_CHILD | WS_VISIBLE | NOT WS_BORDER
 FONT 8, "MS Sans Serif"
@@ -151,12 +155,12 @@ BEGIN
     LTEXT "Terminal screen dimensions:", IDC2_DIMSTATIC, SCOL
     GRID(4,4,15)
     RTEXT "&Rows", IDC2_ROWSSTATIC, ADJ(2) COL(1), SS(1,2)
-    EDITTEXT "", IDC2_ROWSEDIT, COL(2), SS(1,3)
+    EDITTEXT IDC2_ROWSEDIT, COL(2), SS(1,3)
     RTEXT "Colu&mns", IDC2_COLSSTATIC, ADJ(2) COL(3), SS(1,2) 
-    EDITTEXT "", IDC2_COLSEDIT, COL(4), SS(1,3)
+    EDITTEXT IDC2_COLSEDIT, COL(4), SS(1,3)
     NEXT
     RTEXT "&Saved lines of scrollback", IDC2_SAVESTATIC, ADJ(2) COL(1), SS(3,2)
-    EDITTEXT "", IDC2_SAVEEDIT, COL(4), SS(1,3)
+    EDITTEXT IDC2_SAVEEDIT, COL(4), SS(1,3)
     NEXT(2)
     GRID(3,8,0)
     RTEXT "Font:", IDC2_FONTSTATIC, ADJ(3) COL(1), SS(2)
@@ -166,12 +170,8 @@ BEGIN
     GRID(1,8,10)
     AUTOCHECKBOX "Auto &wrap mode initially on", IDC2_WRAPMODE, SCOL
     AUTOCHECKBOX "&DEC Origin Mode initially on", IDC2_DECOM, SCOL
-    AUTOCHECKBOX "Avoid ever using &icon title", IDC2_WINNAME, SCOL
     AUTOCHECKBOX "Implicit CR in every &LF", IDC2_LFHASCR, SCOL
-    AUTOCHECKBOX "&Blinking cursor", IDC1_BLINKCUR, SCOL
     AUTOCHECKBOX "Bee&p enabled", IDC1_BEEP, SCOL
-    AUTOCHECKBOX "Displa&y scrollbar", IDC2_SCROLLBAR, SCOL
-    AUTOCHECKBOX "Loc&k Window size", IDC2_LOCKSIZE, SCOL
     AUTOCHECKBOX "Use Back&ground colour erase", IDC2_BCE, SCOL
     AUTOCHECKBOX "Enable bli&nking text", IDC2_BLINKTEXT, SCOL
     GAP(6)
@@ -179,6 +179,23 @@ BEGIN
     GAP(6)
 END
 
+/* Accelerators used: [aco] bikty */
+IDD_PANELW DIALOG DISCARDABLE 6, 30, 168, 163
+STYLE WS_CHILD | WS_VISIBLE | NOT WS_BORDER
+FONT 8, "MS Sans Serif"
+INIT(10,176,8,162) SPOS(3,3) 
+BEGIN
+    GRID(4,4,24)
+    LTEXT "Initial window &title:", IDCW_WINTITLE, COL(1), SS(3,2)
+    EDITTEXT IDCW_WINEDIT, ADJ(8) COL(1), SS(3,3), ES_AUTOHSCROLL
+    NEXT(2)
+    GRID(1,8,10)
+    AUTOCHECKBOX "Avoid ever using &icon title", IDCW_WINNAME, SCOL
+    AUTOCHECKBOX "&Blinking cursor", IDCW_BLINKCUR, SCOL
+    AUTOCHECKBOX "Displa&y scrollbar", IDCW_SCROLLBAR, SCOL
+    AUTOCHECKBOX "Loc&k Window size", IDCW_LOCKSIZE, SCOL
+END
+
 /* Accelerators used: [aco] bdflrstuv */
 IDD_PANEL3 DIALOG DISCARDABLE 6, 30, 168, 163
 STYLE WS_CHILD | WS_VISIBLE | NOT WS_BORDER
@@ -187,22 +204,22 @@ INIT(10,176,8,162) SPOS(3,3)
 BEGIN
     GRID(2,4,14)
     LTEXT "Terminal-&type string", IDC3_TTSTATIC, ADJ(2) COL(1), SS(1,2)
-    EDITTEXT "", IDC3_TTEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
+    EDITTEXT IDC3_TTEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
     NEXT
     LTEXT "Terminal-&speed string", IDC3_TSSTATIC, ADJ(2) COL(1), SS(1,2)
-    EDITTEXT "", IDC3_TSEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
+    EDITTEXT IDC3_TSEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
     NEXT
     LTEXT "Auto-login &username", IDC3_LOGSTATIC, ADJ(2) COL(1), SS(1,2)
-    EDITTEXT "", IDC3_LOGEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
+    EDITTEXT IDC3_LOGEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
     NEXT
     GAP(8)
     GRID(1,8,10)
     LTEXT "Environment variables:", IDC3_ENVSTATIC, SCOL
     GRID(5,4,14)
     LTEXT "&Variable", IDC3_VARSTATIC, ADJ(2) COL(1), SS(1,2)
-    EDITTEXT "", IDC3_VAREDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
+    EDITTEXT IDC3_VAREDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
     LTEXT "Va&lue", IDC3_VALSTATIC, ADJ(2) COL(3), SS(1,2)
-    EDITTEXT "", IDC3_VALEDIT, COL(4), SS(2,3), ES_AUTOHSCROLL
+    EDITTEXT IDC3_VALEDIT, COL(4), SS(2,3), ES_AUTOHSCROLL
     NEXT
     GAP(4)
     GRID(4,55,0)
@@ -220,7 +237,7 @@ BEGIN
     NEXT
 END
 
-/* Accelerators used: [aco] 123abdhkmptu */
+/* Accelerators used: [aco] 123abdhkmprtu */
 IDD_PANEL35 DIALOG DISCARDABLE 6, 30, 168, 163
 STYLE WS_CHILD | WS_VISIBLE | NOT WS_BORDER
 FONT 8, "MS Sans Serif"
@@ -228,18 +245,18 @@ INIT(10,176,8,162) SPOS(3,3)
 BEGIN
     GRID(2,4,16)
     LTEXT "Terminal-&type string", IDC3_TTSTATIC, ADJ(2) COL(1), SS(1,2)
-    EDITTEXT "", IDC3_TTEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
+    EDITTEXT IDC3_TTEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
     NEXT
     GRID(1,8,10)
     AUTOCHECKBOX "Don't allocate a &pseudo-terminal", IDC3_NOPTY, SCOL
     GRID(2,4,16)
     LTEXT "Auto-login &username", IDC3_LOGSTATIC, ADJ(2) COL(1), SS(1,2)
-    EDITTEXT "", IDC3_LOGEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
+    EDITTEXT IDC3_LOGEDIT, COL(2), SS(1,3), ES_AUTOHSCROLL
     NEXT
     GRID(11,8,10)
     LTEXT "Cipher:", IDC3_CIPHERSTATIC, COL(1), SS(2)
     AUTORADIOBUTTON "&3DES", IDC3_CIPHER3DES, COL(3), SS(3), WS_GROUP
-    AUTORADIOBUTTON "&Blowfish", IDC3_CIPHERBLOWF, COL(6), SS(3), WS_GROUP
+    AUTORADIOBUTTON "&Blowfish", IDC3_CIPHERBLOWF, COL(6), SS(3)
     AUTORADIOBUTTON "&DES", IDC3_CIPHERDES, COL(9), SS(3)
     NEXT
     GRID(1,8,10)
@@ -252,7 +269,10 @@ BEGIN
     NEXT
     GRID(4,4,24)
     LTEXT "Public &key file:", IDC3_PKSTATIC, COL(1), SS(3,2)
-    EDITTEXT "", IDC3_PKEDIT, ADJ(8) COL(1), SS(3,3), ES_AUTOHSCROLL
+    EDITTEXT IDC3_PKEDIT, ADJ(8) COL(1), SS(3,3), ES_AUTOHSCROLL
+    NEXT(2)
+    LTEXT "&Remote command:", IDC3_CMDSTATIC, COL(1), SS(3,2)
+    EDITTEXT IDC3_CMDEDIT, ADJ(8) COL(1), SS(3,3), ES_AUTOHSCROLL
     GRID(4,12,24)
     PUSHBUTTON "C&hange...", IDC3_PKBUTTON, ADJ(8) COL(4), SS(1)
     NEXT
@@ -280,7 +300,7 @@ BEGIN
     GRID(1,14,17)
     PUSHBUTTON "&Set", IDC4_CCSET, 33, CURY, 34, 14
     LTEXT "&to class", IDC4_CCSTATIC2, 73, CURY+3, 26, 8
-    EDITTEXT "", IDC4_CCEDIT, 105, CURY+1, 36, 12
+    EDITTEXT IDC4_CCEDIT, 105, CURY+1, 36, 12
     NEXT
 END