dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ListBox and state now play along

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2072 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-01-19 16:56:10 +00:00
parent ed82cf39f6
commit 03dd8209c2
2 changed files with 35 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Contrib/InstallOptions/InstallerOptions.cpp
View file

@ -742,7 +742,7 @@ char old_title[1024];
int createCfgDlg() int createCfgDlg()
{ {
UINT nAddMsg; UINT nAddMsg, nFindMsg, nSetSelMsg;
g_is_back=0; g_is_back=0;
g_is_cancel=0; g_is_cancel=0;
@ -965,10 +965,12 @@ int createCfgDlg()
{ {
SendMessage(hwCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); SendMessage(hwCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
} }
} else if ( } else if (pFields[nIdx].pszListItems && (
((pFields[nIdx].nType == FIELD_COMBOBOX) && (nAddMsg = CB_ADDSTRING)) || ((pFields[nIdx].nType == FIELD_COMBOBOX) && (nAddMsg = CB_ADDSTRING)
((pFields[nIdx].nType == FIELD_LISTBOX ) && (nAddMsg = LB_ADDSTRING)) && (nFindMsg = CB_FINDSTRINGEXACT) && (nSetSelMsg = CB_SETCURSEL)) ||
) { ((pFields[nIdx].nType == FIELD_LISTBOX ) && (nAddMsg = LB_ADDSTRING)
&& (nFindMsg = LB_FINDSTRINGEXACT) && (nSetSelMsg = LB_SETCURSEL))
)) {
// if this is a listbox or combobox, we need to add the list items. // if this is a listbox or combobox, we need to add the list items.
char *pszStart, *pszEnd; char *pszStart, *pszEnd;
pszStart = pszEnd = pFields[nIdx].pszListItems; pszStart = pszEnd = pFields[nIdx].pszListItems;
@ -985,9 +987,34 @@ int createCfgDlg()
pszEnd++; pszEnd++;
} }
if (pFields[nIdx].pszState) { if (pFields[nIdx].pszState) {
int nItem = SendMessage(hwCtrl, CB_FINDSTRINGEXACT, -1, (LPARAM)pFields[nIdx].pszState); if (pFields[nIdx].nFlags & FLAG_MULTISELECT && nFindMsg == LB_FINDSTRINGEXACT) {
if (nItem != CB_ERR) { SendMessage(hwCtrl, LB_SETSEL, FALSE, -1);
SendMessage(hwCtrl, CB_SETCURSEL, nItem, 0); pszStart = pszEnd = pFields[nIdx].pszState;
while (*pszStart) {
char cLast = *pszEnd;
if (*pszEnd == '|') *pszEnd = '\0';
if (!*pszEnd) {
if (pszEnd > pszStart) {
int nItem = SendMessage(hwCtrl, nFindMsg, -1, (LPARAM)pszStart);
if (nItem != CB_ERR) { // CB_ERR == LB_ERR == -1
SendMessage(hwCtrl, LB_SETSEL, TRUE, nItem);
}
}
if (cLast) {
do {
pszEnd++;
} while (*pszEnd == '|');
}
pszStart = pszEnd;
}
pszEnd++;
}
}
else {
int nItem = SendMessage(hwCtrl, nFindMsg, -1, (LPARAM)pFields[nIdx].pszState);
if (nItem != CB_ERR) { // CB_ERR == LB_ERR == -1
SendMessage(hwCtrl, nSetSelMsg, nItem, 0);
}
} }
} }
} else if (pFields[nIdx].nType == FIELD_BITMAP || pFields[nIdx].nType == FIELD_ICON) { } else if (pFields[nIdx].nType == FIELD_BITMAP || pFields[nIdx].nType == FIELD_ICON) {

BIN
Plugins/InstallOptions.dll
View file

Binary file not shown.