Fix Jacob's fix for mingw32 resource compiler so that it _only_ happens

[u/mdw/putty] / win_res.rc

diff --git a/win_res.rc b/win_res.rc
index d181ed7..b374041 100644 (file)
--- a/win_res.rc
+++ b/win_res.rc
@@ -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 @@ FONT 8, "MS Sans Serif"
 BEGIN
     
     LTEXT "Host &Name", IDC0_HOSTSTATIC, 3, 3, 119, 8
-    EDITTEXT "", IDC0_HOST,  3, 11, 119, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC0_HOST,  3, 11, 119, 12, ES_AUTOHSCROLL
     LTEXT "&Port", IDC0_PORTSTATIC, 129, 3, 35, 8
-    EDITTEXT "", IDC0_PORT,  129, 11, 35, 12
+    EDITTEXT IDC0_PORT,  129, 11, 35, 12
     
     
 #ifdef FWHACK
@@ -91,7 +95,7 @@ BEGIN
     
     LTEXT "Stor&ed Sessions", IDC0_SESSSTATIC, 3, 37, 162, 8
     
-    EDITTEXT "", IDC0_SESSEDIT, 3, 45, 119, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC0_SESSEDIT, 3, 45, 119, 12, ES_AUTOHSCROLL
     
     
     LISTBOX IDC0_SESSLIST, 3, 59, 119, 71,
@@ -151,12 +155,12 @@ BEGIN
     LTEXT "Terminal screen dimensions:", IDC2_DIMSTATIC, 3, 3, 162, 8
     
     RTEXT "&Rows", IDC2_ROWSSTATIC,  3, 15, 35, 8
-    EDITTEXT "", IDC2_ROWSEDIT, 45, 13, 35, 12
+    EDITTEXT IDC2_ROWSEDIT, 45, 13, 35, 12
     RTEXT "Colu&mns", IDC2_COLSSTATIC,  87, 15, 35, 8 
-    EDITTEXT "", IDC2_COLSEDIT, 129, 13, 35, 12
+    EDITTEXT IDC2_COLSEDIT, 129, 13, 35, 12
     
     RTEXT "&Saved lines of scrollback", IDC2_SAVESTATIC,  3, 30, 119, 8
-    EDITTEXT "", IDC2_SAVEEDIT, 129, 28, 35, 12
+    EDITTEXT IDC2_SAVEEDIT, 129, 28, 35, 12
     
     
     RTEXT "Font:", IDC2_FONTSTATIC,  3, 48, 105, 8
@@ -187,22 +191,22 @@ FONT 8, "MS Sans Serif"
 BEGIN
     
     LTEXT "Terminal-&type string", IDC3_TTSTATIC,  3, 5, 77, 8
-    EDITTEXT "", IDC3_TTEDIT, 87, 3, 77, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC3_TTEDIT, 87, 3, 77, 12, ES_AUTOHSCROLL
     
     LTEXT "Terminal-&speed string", IDC3_TSSTATIC,  3, 19, 77, 8
-    EDITTEXT "", IDC3_TSEDIT, 87, 17, 77, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC3_TSEDIT, 87, 17, 77, 12, ES_AUTOHSCROLL
     
     LTEXT "Auto-login &username", IDC3_LOGSTATIC,  3, 33, 77, 8
-    EDITTEXT "", IDC3_LOGEDIT, 87, 31, 77, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC3_LOGEDIT, 87, 31, 77, 12, ES_AUTOHSCROLL
     
     
     
     LTEXT "Environment variables:", IDC3_ENVSTATIC, 3, 53, 162, 8
     
     LTEXT "&Variable", IDC3_VARSTATIC,  3, 65, 26, 8
-    EDITTEXT "", IDC3_VAREDIT, 36, 63, 26, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC3_VAREDIT, 36, 63, 26, 12, ES_AUTOHSCROLL
     LTEXT "Va&lue", IDC3_VALSTATIC,  70, 65, 26, 8
-    EDITTEXT "", IDC3_VALEDIT, 104, 63, 59, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC3_VALEDIT, 104, 63, 59, 12, ES_AUTOHSCROLL
     
     
     
@@ -228,13 +232,13 @@ FONT 8, "MS Sans Serif"
 BEGIN
     
     LTEXT "Terminal-&type string", IDC3_TTSTATIC,  3, 5, 77, 8
-    EDITTEXT "", IDC3_TTEDIT, 87, 3, 77, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC3_TTEDIT, 87, 3, 77, 12, ES_AUTOHSCROLL
     
     
     AUTOCHECKBOX "Don't allocate a &pseudo-terminal", IDC3_NOPTY, 3, 19, 162, 8
     
     LTEXT "Auto-login &username", IDC3_LOGSTATIC,  3, 31, 77, 8
-    EDITTEXT "", IDC3_LOGEDIT, 87, 29, 77, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC3_LOGEDIT, 87, 29, 77, 12, ES_AUTOHSCROLL
     
     
     LTEXT "Cipher:", IDC3_CIPHERSTATIC, 3, 45, 23, 8
@@ -252,7 +256,7 @@ BEGIN
     
     
     LTEXT "Public &key file:", IDC3_PKSTATIC, 3, 85, 119, 8
-    EDITTEXT "", IDC3_PKEDIT,  3, 93, 119, 12, ES_AUTOHSCROLL
+    EDITTEXT IDC3_PKEDIT,  3, 93, 119, 12, ES_AUTOHSCROLL
     
     PUSHBUTTON "C&hange...", IDC3_PKBUTTON,  129, 93, 35, 12
     
@@ -280,7 +284,7 @@ BEGIN
     
     PUSHBUTTON "&Set", IDC4_CCSET, 33, 147, 34, 14
     LTEXT "&to class", IDC4_CCSTATIC2, 73, 147+3, 26, 8
-    EDITTEXT "", IDC4_CCEDIT, 105, 147+1, 36, 12
+    EDITTEXT IDC4_CCEDIT, 105, 147+1, 36, 12
     
 END