From 3678bd9cf41b24298cb2f732606f7a82994addf0 Mon Sep 17 00:00:00 2001 From: ramon18 Date: Thu, 17 Jul 2003 02:00:23 +0000 Subject: [PATCH] "Space required" updated after every .OnSelChange git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2730 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/exehead/Ui.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c index d6bb1b14..a153d4d2 100644 --- a/Source/exehead/Ui.c +++ b/Source/exehead/Ui.c @@ -982,7 +982,6 @@ static BOOL CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar HWND hwndCombo1 = GetUIItem(IDC_COMBO1); HWND hwndTree1 = GetUIItem(IDC_TREE1); extern HWND g_SectionHack; - BYTE bSelChanged=0; if (uMsg == WM_INITDIALOG) { int doLines=0; @@ -1165,9 +1164,8 @@ static BOOL CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar CheckTreeItem(hwndTree1,tvItem.hItem,1); } lParam = 0; + wParam = 1; uMsg = WM_IN_UPDATEMSG; - - bSelChanged=1; } // not ro } // was valid click } // was click or hack @@ -1199,7 +1197,6 @@ static BOOL CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar if (uMsg == WM_NOTIFY_INSTTYPE_CHANGE || t != CB_ERR) { int whichcfg=SendMessage(hwndCombo1,CB_GETITEMDATA,t,0); - bSelChanged = uMsg == uMsg != WM_NOTIFY_INSTTYPE_CHANGE; if (uMsg == WM_NOTIFY_INSTTYPE_CHANGE) { whichcfg = g_flags.cur_insttype; @@ -1257,6 +1254,11 @@ static BOOL CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar } if (uMsg == WM_IN_UPDATEMSG) { +#if defined(NSIS_SUPPORT_CODECALLBACKS) && defined(NSIS_CONFIG_COMPONENTPAGE) + if ( wParam ) + ExecuteCodeSegment(g_inst_header->code_onSelChange,NULL); +#endif//NSIS_SUPPORT_CODECALLBACKS && NSIS_CONFIG_COMPONENTPAGE + if (inst_flags&CH_FLAGS_COMP_ONLY_ON_CUSTOM) { int c=(g_flags.cur_insttype == NSIS_MAX_INST_TYPES)<<3;// SW_SHOWNA=8, SW_HIDE=0 @@ -1309,11 +1311,6 @@ static BOOL CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar } } -#if defined(NSIS_SUPPORT_CODECALLBACKS) && defined(NSIS_CONFIG_COMPONENTPAGE) - if ( bSelChanged ) - ExecuteCodeSegment(g_inst_header->code_onSelChange,NULL); -#endif//NSIS_SUPPORT_CODECALLBACKS && NSIS_CONFIG_COMPONENTPAGE - return HandleStaticBkColor(); } #endif//NSIS_CONFIG_COMPONENTPAGE