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

Much cleaner license focus implementation

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@941 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
sunjammerx 2002-09-06 19:38:35 +00:00
parent 983adbcbad
commit ef42fb1e27
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/exehead/Ui.c
View file

@ -555,10 +555,7 @@ static BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
} }
if (m_page < 0 || m_page > g_max_page) if (m_page < 0 || m_page > g_max_page)
{
EndDialog(hwndDlg,0); EndDialog(hwndDlg,0);
gDontFookWithFocus = FALSE;
}
else if (!m_curwnd) else if (!m_curwnd)
{ {
HWND hwndtmp; HWND hwndtmp;
@ -578,6 +575,7 @@ static BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
SetWindowText(hwndDlg,g_tmp); SetWindowText(hwndDlg,g_tmp);
gDontFookWithFocus = FALSE;
m_curwnd=CreateDialog(g_hInstance,windows[g_page_offs+m_page].id,hwndDlg,windows[g_page_offs+m_page].proc); m_curwnd=CreateDialog(g_hInstance,windows[g_page_offs+m_page].id,hwndDlg,windows[g_page_offs+m_page].proc);
if (m_curwnd) if (m_curwnd)
{ {
@ -632,7 +630,6 @@ static BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInstFailed,NULL); ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInstFailed,NULL);
#endif//NSIS_SUPPORT_CODECALLBACKS #endif//NSIS_SUPPORT_CODECALLBACKS
EndDialog(hwndDlg,2); EndDialog(hwndDlg,2);
gDontFookWithFocus = FALSE;
} }
else else
{ {
@ -641,7 +638,6 @@ static BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
#endif//NSIS_SUPPORT_CODECALLBACKS #endif//NSIS_SUPPORT_CODECALLBACKS
{ {
EndDialog(hwndDlg,1); EndDialog(hwndDlg,1);
gDontFookWithFocus = FALSE;
} }
} }
} }
@ -1408,10 +1404,7 @@ static BOOL CALLBACK InstProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
if (uMsg == WM_NOTIFY_INSTPROC_DONE) if (uMsg == WM_NOTIFY_INSTPROC_DONE)
{ {
if (g_quit_flag) if (g_quit_flag)
{
EndDialog(g_hwnd,1); EndDialog(g_hwnd,1);
gDontFookWithFocus = FALSE;
}
else if (!wParam) else if (!wParam)
{ {
HWND h=GetDlgItem(g_hwnd,IDOK); HWND h=GetDlgItem(g_hwnd,IDOK);