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

Replaced .onStaticBkColor with .onInitDialog

Browse source 
No more threads conflicts


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@730 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-08-25 10:52:43 +00:00
parent 156b243620
commit acc50c24b1
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Source/exehead/Ui.c
View file

@ -128,17 +128,11 @@ static HWND NSISCALL GetUIItem(HWND defhw, WORD def, WORD custom) {
static BOOL NSISCALL _HandleStaticBkColor(UINT uMsg, WPARAM wParam, LPARAM lParam) { static BOOL NSISCALL _HandleStaticBkColor(UINT uMsg, WPARAM wParam, LPARAM lParam) {
BOOL ret=0; BOOL ret=0;
if (uMsg == WM_CTLCOLORSTATIC) { if (uMsg == WM_CTLCOLORSTATIC) {
if (g_inst_cmnheader->code_onStaticCtlBkColor >= 0) { COLORREF color = GetWindowLong((HWND)lParam, GWL_USERDATA);
char tmp[NSIS_MAX_STRLEN]; if (color) {
mystrcpy(tmp,g_usrvars[0]); LOGBRUSH b={BS_SOLID, color-1, 0};
myitoa(g_usrvars[0],lParam); SetBkColor((HDC)wParam, b.lbColor);
ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onStaticCtlBkColor,NULL); ret=(BOOL)CreateBrushIndirect(&b);
if (myatoi(g_usrvars[0]) != -1) {
LOGBRUSH b={BS_SOLID,myatoi(g_usrvars[0]),0};
SetBkColor((HDC)wParam, b.lbColor);
ret=(BOOL)CreateBrushIndirect(&b);
}
mystrcpy(g_usrvars[0],tmp);
} }
} }
return ret; return ret;
@ -563,6 +557,7 @@ static BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
GetWindowRect(GetDlgItem(hwndDlg,IDC_CHILDRECT),&r); GetWindowRect(GetDlgItem(hwndDlg,IDC_CHILDRECT),&r);
ScreenToClient(hwndDlg,(LPPOINT)&r); ScreenToClient(hwndDlg,(LPPOINT)&r);
SetWindowPos(m_curwnd,0,r.left,r.top,0,0,SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOZORDER); SetWindowPos(m_curwnd,0,r.left,r.top,0,0,SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOZORDER);
ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInitDialog,NULL);
ShowWindow(m_curwnd,SW_SHOWNA); ShowWindow(m_curwnd,SW_SHOWNA);
} }
@ -1192,12 +1187,12 @@ void NSISCALL update_status_text_from_lang(langid_t id, const char *text2)
void NSISCALL update_status_text(const char *text1, const char *text2) void NSISCALL update_status_text(const char *text1, const char *text2)
{ {
static LVITEM new_item = {LVIF_TEXT,0,0,0,0,ps_tmpbuf}; static LVITEM new_item = {LVIF_TEXT,0,0,0,0,g_tmp};
RECT r; RECT r;
if (insthwnd) if (insthwnd)
{ {
if (mystrlen(text1)+mystrlen(text2) >= sizeof(ps_tmpbuf)) return; if (mystrlen(text1)+mystrlen(text2) >= sizeof(g_tmp)) return;
wsprintf(ps_tmpbuf,"%s%s",text1,text2); wsprintf(g_tmp,"%s%s",text1,text2);
if ((ui_st_updateflag&1)) if ((ui_st_updateflag&1))
{ {
// Changed by Amir Szekely 26th July 2002 // Changed by Amir Szekely 26th July 2002