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

Fixed bug #671161: DISABLED dir and file request fields now disable the browse button too.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2074 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-01-20 13:57:30 +00:00
parent e83a1a6e0f
commit b2beea777c
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Contrib/InstallOptions/InstallerOptions.cpp
View file

@ -427,6 +427,7 @@ void AddBrowseButtons() {
pNewField->nControlID = 1200 + nNumFields;
pNewField->nParentIdx = nIdx;
pNewField->nType = FIELD_BROWSEBUTTON;
pNewField->nFlags = pFields[nIdx].nFlags & (FLAG_DISABLED | FLAG_NOTABSTOP);
//pNewField->pszListItems = NULL;
//pNewField->nMaxLength = 0;
//pNewField->nMinLength = 0;
@ -875,9 +876,11 @@ int createCfgDlg()
WS_EX_TRANSPARENT }
};
int nType = pFields[nIdx].nType;
#undef DEFAULT_STYLES
if (pFields[nIdx].nType < 1 || pFields[nIdx].nType > (sizeof(ClassTable) / sizeof(ClassTable[0])))
if (nType < 1 || nType > (sizeof(ClassTable) / sizeof(ClassTable[0])))
continue;
DWORD dwStyle = ClassTable[pFields[nIdx].nType - 1].dwStyle;
@ -904,7 +907,7 @@ int createCfgDlg()
rect.bottom += dialog_r.bottom - dialog_r.top;
char *title = pFields[nIdx].pszText;
switch (pFields[nIdx].nType) {
switch (nType) {
case FIELD_CHECKBOX:
case FIELD_RADIOBUTTON:
if (pFields[nIdx].nFlags & FLAG_RIGHT)
@ -952,7 +955,7 @@ int createCfgDlg()
SendMessage(hwCtrl, WM_SETFONT, (WPARAM)hFont, TRUE);
// make sure we created the window, then set additional attributes
if (pFields[nIdx].nMaxLength > 0) {
switch (pFields[nIdx].nType) {
switch (nType) {
case FIELD_TEXT:
case FIELD_DIRREQUEST:
case FIELD_FILEREQUEST:
@ -960,15 +963,15 @@ int createCfgDlg()
break;
}
}
if ((pFields[nIdx].nType == FIELD_CHECKBOX) || (pFields[nIdx].nType == FIELD_RADIOBUTTON)) {
if ((nType == FIELD_CHECKBOX) || (nType == FIELD_RADIOBUTTON)) {
if (pFields[nIdx].pszState[0] == '1')
{
SendMessage(hwCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
}
} else if (pFields[nIdx].pszListItems && (
((pFields[nIdx].nType == FIELD_COMBOBOX) && (nAddMsg = CB_ADDSTRING)
((nType == FIELD_COMBOBOX) && (nAddMsg = CB_ADDSTRING)
&& (nFindMsg = CB_FINDSTRINGEXACT) && (nSetSelMsg = CB_SETCURSEL)) ||
((pFields[nIdx].nType == FIELD_LISTBOX ) && (nAddMsg = LB_ADDSTRING)
((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.
@ -1017,8 +1020,8 @@ int createCfgDlg()
}
}
}
} else if (pFields[nIdx].nType == FIELD_BITMAP || pFields[nIdx].nType == FIELD_ICON) {
WPARAM nImageType = pFields[nIdx].nType == FIELD_BITMAP ? IMAGE_BITMAP : IMAGE_ICON;
} else if (nType == FIELD_BITMAP || nType == FIELD_ICON) {
WPARAM nImageType = nType == FIELD_BITMAP ? IMAGE_BITMAP : IMAGE_ICON;
SendMessage(
hwCtrl,
STM_SETIMAGE,

BIN
Plugins/InstallOptions.dll
View file

Binary file not shown.