From b9ae37853359bebd6b4778f5ac0436f1328db360 Mon Sep 17 00:00:00 2001 From: kichik Date: Thu, 3 Apr 2003 13:17:54 +0000 Subject: [PATCH] Added EXTENDEDSELCT flag for list boxes which replaces MULTISELECT that now acts exactly as the real style flag ([double] click turns on or off selection) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2415 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/InstallOptions/InstallerOptions.cpp | 12 ++++++++---- Contrib/InstallOptions/Readme.html | 7 +++++-- Plugins/InstallOptions.dll | Bin 12800 -> 12800 bytes 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index 44766f3c..a9b81bcb 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -58,12 +58,13 @@ char *STRDUP(const char *c) // listbox flags #define FLAG_MULTISELECT (64) +#define FLAG_EXTENDEDSEL (128) // combobox flags -#define FLAG_DROPLIST (128) +#define FLAG_DROPLIST (256) // bitmap flags -#define FLAG_RESIZETOFIT (256) +#define FLAG_RESIZETOFIT (512) struct TableEntry { char *pszName; @@ -460,6 +461,7 @@ bool ReadSettings(void) { { "PASSWORD", FLAG_PASSWORD }, { "DROPLIST", FLAG_DROPLIST }, { "MULTISELECT", FLAG_MULTISELECT }, + { "EXTENDEDSELCT", FLAG_EXTENDEDSEL }, { "FILE_EXPLORER", OFN_EXPLORER }, { "FILE_HIDEREADONLY", OFN_HIDEREADONLY }, { "RESIZETOFIT", FLAG_RESIZETOFIT }, @@ -835,8 +837,10 @@ int createCfgDlg() title = pFields[nIdx].pszState; break; case FIELD_LISTBOX: - if (pFields[nIdx].nFlags & FLAG_MULTISELECT) + if (pFields[nIdx].nFlags & FLAG_EXTENDEDSEL) dwStyle |= LBS_EXTENDEDSEL; + if (pFields[nIdx].nFlags & FLAG_MULTISELECT) + dwStyle |= LBS_MULTIPLESEL; break; } @@ -899,7 +903,7 @@ int createCfgDlg() pszEnd++; } if (pFields[nIdx].pszState) { - if (pFields[nIdx].nFlags & FLAG_MULTISELECT && nFindMsg == LB_FINDSTRINGEXACT) { + if (pFields[nIdx].nFlags & (FLAG_MULTISELECT|FLAG_EXTENDEDSEL) && nFindMsg == LB_FINDSTRINGEXACT) { SendMessage(hwCtrl, LB_SETSEL, FALSE, -1); pszStart = pszEnd = pFields[nIdx].pszState; while (*pszStart) { diff --git a/Contrib/InstallOptions/Readme.html b/Contrib/InstallOptions/Readme.html index 9e3e862c..e145f439 100644 --- a/Contrib/InstallOptions/Readme.html +++ b/Contrib/InstallOptions/Readme.html @@ -379,8 +379,11 @@ numbers from 1 to NumFields. Each Field section can contain the following values MULTISELECT Used by "Listbox" - controls to specify if more than item may be selected. If this flag - is not specified,only one item may be selected from the list. + controls. Turns string selection on or off each time the user clicks or double-clicks a string in the list box. The user can select any number of strings. If this flag and EXTENDEDSELCT are not specified, only one item can be selected from the the list. + + EXTENDEDSELCT + Used by "Listbox" + controls. Allows multiple items to be selected by using the SHIFT key and the mouse or special key combinations. If this flag and MULTISELECT are not specified, only one item can be selected from the the list. RESIZETOFIT This causes "Bitmap" diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index 8602a0cdfb85d61a5159b93a6d97fb0973e3ddcd..a6742932b09f4541b58faf53b6334ad5d6fa9905 100644 GIT binary patch delta 5282 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