Cancel button available on all pages after the instfiles page but the last page unless /ENABLECANCEL was used in its Page command
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2246 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
267e7ebfb6
commit
b97418269b
6 changed files with 50 additions and 20 deletions
|
@ -545,9 +545,10 @@ nextPage:
|
|||
hwndtmp=GetDlgItem(hwndDlg,IDC_BACK);
|
||||
SendMessage(g_hwnd,DM_SETDEFID,IDOK,0);
|
||||
SetWindowLong(hwndtmp,GWL_STYLE,GetWindowLong(hwndtmp,GWL_STYLE)&~BS_DEFPUSHBUTTON);
|
||||
ShowWindow(hwndtmp,this_page->back&SW_SHOWNA);// SW_HIDE = 0
|
||||
EnableWindow(hwndtmp,this_page->back&2);
|
||||
ShowWindow(hwndtmp,this_page->button_states&SW_SHOWNA);// SW_HIDE = 0, SW_SHOWNA = 8
|
||||
EnableWindow(hwndtmp,this_page->button_states&2);
|
||||
EnableWindow(m_hwndOK,1);
|
||||
EnableWindow(m_hwndCancel,this_page->button_states&4);
|
||||
|
||||
mystrcpy(g_tmp,g_caption);
|
||||
process_string_fromtab(g_tmp+mystrlen(g_tmp),this_page->caption);
|
||||
|
@ -1389,7 +1390,6 @@ static BOOL CALLBACK InstProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
|
|||
}
|
||||
|
||||
EnableWindow(m_hwndOK,0);
|
||||
EnableWindow(m_hwndCancel,0);
|
||||
}
|
||||
if (uMsg == WM_NOTIFY_START) {
|
||||
DWORD id;
|
||||
|
|
|
@ -470,7 +470,7 @@ typedef struct
|
|||
#endif //NSIS_SUPPORT_CODECALLBACKS
|
||||
int caption; // caption tab
|
||||
int next;
|
||||
int back;
|
||||
int button_states;
|
||||
} page;
|
||||
|
||||
// the following are only used/implemented in exehead, not makensis.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue