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

Avoid NSD_Add[Ex]Style register parameter conflict

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6274 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2012-11-09 22:35:55 +00:00
parent be4100d88e
commit ae879b7c0a
1 changed files with 6 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Contrib/nsDialogs/nsDialogs.nsh
View file

@ -352,31 +352,16 @@ Header file for creating custom installer pages with nsDialogs
!define NSD_KillTimer `!insertmacro _NSD_KillTimer`
!macro _NSD_AddStyle CONTROL STYLE
!macro _NSD_GWLAddFlags GWL HWND DATA
Push $0
System::Call "user32::GetWindowLong(i ${CONTROL}, i ${GWL_STYLE}) i .r0"
System::Call "user32::SetWindowLong(i ${CONTROL}, i ${GWL_STYLE}, i $0|${STYLE})"
Pop $0
System::Call "user32::GetWindowLong(i${HWND},i${GWL})i.s"
System::Int64Op "${DATA}" |
System::Call "user32::SetWindowLong(i${HWND},i${GWL},is)"
!macroend
!define NSD_AddStyle "!insertmacro _NSD_AddStyle"
!macro _NSD_AddExStyle CONTROL EXSTYLE
Push $0
System::Call "user32::GetWindowLong(i ${CONTROL}, i ${GWL_EXSTYLE}) i .r0"
System::Call "user32::SetWindowLong(i ${CONTROL}, i ${GWL_EXSTYLE}, i $0|${EXSTYLE})"
Pop $0
!macroend
!define NSD_AddExStyle "!insertmacro _NSD_AddExStyle"
!define NSD_AddStyle "!insertmacro _NSD_GWLAddFlags ${GWL_STYLE} "
!define NSD_AddExStyle "!insertmacro _NSD_GWLAddFlags ${GWL_EXSTYLE} "
!macro __NSD_GetText CONTROL VAR