From 1293da6d1ea258f5bd629fe7d0a6c1f7ec288965 Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Tue, 30 Oct 2018 23:22:00 +0000
Subject: [PATCH] Reduce confusion by hiding MakeNSISW version.

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7030 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Makensisw/Readme.txt    |  3 +++
 Contrib/Makensisw/SConscript    |  2 +-
 Contrib/Makensisw/makensisw.cpp | 12 ++++++++++--
 Contrib/Makensisw/resource.rc   |  2 +-
 Contrib/Makensisw/version.cpp   |  4 ++--
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Contrib/Makensisw/Readme.txt b/Contrib/Makensisw/Readme.txt
index f397da0c..93c83ff8 100644
--- a/Contrib/Makensisw/Readme.txt
+++ b/Contrib/Makensisw/Readme.txt
@@ -199,6 +199,9 @@ Version History
 - Update check switched from JNetLib to WinInet
 - New file type icons
 
+2.3.4
+- Added Window Info/Spy feature
+
 
 Copyright Information
 ---------------------
diff --git a/Contrib/Makensisw/SConscript b/Contrib/Makensisw/SConscript
index 29199db5..bb5827ae 100644
--- a/Contrib/Makensisw/SConscript
+++ b/Contrib/Makensisw/SConscript
@@ -51,7 +51,7 @@ BuildUtil(
 	res = res,
 	resources = resources,
 	entry = None,
-	defines = ['RELEASE=2.3.3'],
+	defines = ['RELEASE=2.3.4'],
 	docs = docs,
 	root_util = True
 )
diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp
index 9f61c95b..6319ed8b 100644
--- a/Contrib/Makensisw/makensisw.cpp
+++ b/Contrib/Makensisw/makensisw.cpp
@@ -851,13 +851,14 @@ INT_PTR CALLBACK AboutProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
       SendDlgItemMessage(hwndDlg, IDC_ABOUTPORTIONS, WM_SETFONT, (WPARAM)fontnorm, FALSE);
       SendDlgItemMessage(hwndDlg, IDC_NSISVER, WM_SETFONT, (WPARAM)fontnorm, FALSE);
       SendDlgItemMessage(hwndDlg, IDC_OTHERCONTRIB, WM_SETFONT, (WPARAM)fontnorm, FALSE);
-      SetDlgItemText(hwndDlg, IDC_NSISVER, g_sdata.branding);
-      SetDlgItemText(hwndDlg, IDC_ABOUTVERSION, NSISW_VERSION);
+      SendMessage(hwndDlg, WM_APP, 0, 0); // Set IDC_ABOUTVERSION
       SetDlgItemText(hwndDlg, IDC_ABOUTCOPY, COPYRIGHT);
       SetDlgItemText(hwndDlg, IDC_OTHERCONTRIB, CONTRIB);
+      SetDlgItemText(hwndDlg, IDC_NSISVER, g_sdata.branding);
       break;
     }
     case WM_COMMAND:
+      if (wParam == MAKELONG(IDC_ABOUTVERSION, STN_DBLCLK)) goto showversion;
       if (IDOK != LOWORD(wParam)) break;
       // fall through
     case WM_CLOSE:
@@ -866,6 +867,13 @@ INT_PTR CALLBACK AboutProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
       DeleteObject((HGDIOBJ)SendDlgItemMessage(hwndDlg, IDC_ABOUTVERSION, WM_GETFONT, 0, 0));
       DeleteObject((HGDIOBJ)SendDlgItemMessage(hwndDlg, IDC_ABOUTCOPY, WM_GETFONT, 0, 0));
       break;
+    case WM_APP: showversion:
+      {
+        TCHAR buf[200], showver = wParam != 0;
+        wsprintf(buf, _T("MakeNSISW %s%s(NSIS Compiler Interface)"), showver ? NSISW_VERSION : _T(""), showver ? _T(" ") : _T(""));
+        SetDlgItemText(hwndDlg, IDC_ABOUTVERSION, buf);
+      }
+      break;
   }
   return FALSE;
 }
diff --git a/Contrib/Makensisw/resource.rc b/Contrib/Makensisw/resource.rc
index 62b5873a..30ef196c 100644
--- a/Contrib/Makensisw/resource.rc
+++ b/Contrib/Makensisw/resource.rc
@@ -181,7 +181,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,174,104,49,15
     CONTROL         115,IDC_STATIC,"Static",SS_BITMAP,0,0,233,25
-    LTEXT           "MakeNSISW",IDC_ABOUTVERSION,14,31,219,8
+    LTEXT           "MakeNSISW",IDC_ABOUTVERSION,14,31,219,8,SS_NOTIFY
     LTEXT           "Copyright",IDC_ABOUTCOPY,14,43,220,8
     LTEXT           "Other Contributors:",IDC_ABOUTPORTIONS,14,56,220,10
     LTEXT           "",IDC_OTHERCONTRIB,27,68,206,22
diff --git a/Contrib/Makensisw/version.cpp b/Contrib/Makensisw/version.cpp
index 17d4ba6c..dbccc2f6 100644
--- a/Contrib/Makensisw/version.cpp
+++ b/Contrib/Makensisw/version.cpp
@@ -26,7 +26,7 @@
 #define TSTRINGIFY(x) TSTRINGIFY_(x)
 
 #ifdef RELEASE
-     const TCHAR *NSISW_VERSION = _T("MakeNSISW ") TSTRINGIFY(RELEASE) _T(" (NSIS Compiler Interface)");
+     const TCHAR *NSISW_VERSION = TSTRINGIFY(RELEASE);
 #else
-     const TCHAR *NSISW_VERSION = _T("MakeNSISW ") __TDATE__;
+     const TCHAR *NSISW_VERSION = __TDATE__;
 #endif