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

only enable cancel on finish page when there are checkboxes, no compiler warning anymore

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3098 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2003-11-04 21:41:50 +00:00
parent 77e9b58295
commit 2518c7c7b9
3 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Contrib/Modern UI/System.nsh
View file

@ -258,7 +258,9 @@ Var MUI_TEMP2
!macro MUI_ABORTWARNING !macro MUI_ABORTWARNING
!ifdef MUI_FINISHPAGE_ABORTWARNINGCHECK
StrCmp $MUI_NOABORTWARNING "1" mui.quit StrCmp $MUI_NOABORTWARNING "1" mui.quit
!endif
!ifdef MUI_ABORTWARNING_TEXT !ifdef MUI_ABORTWARNING_TEXT
MessageBox MB_YESNO|MB_ICONEXCLAMATION "${MUI_ABORTWARNING_TEXT}" IDYES mui.quit MessageBox MB_YESNO|MB_ICONEXCLAMATION "${MUI_ABORTWARNING_TEXT}" IDYES mui.quit
@ -1383,11 +1385,6 @@ Var MUI_TEMP2
!define MUI_VAR_HWND !define MUI_VAR_HWND
!endif !endif
!ifndef MUI_VAR_NOABORTWARNING
Var MUI_NOABORTWARNING
!define MUI_VAR_NOABORTWARNING
!endif
!ifndef MUI_FINISHPAGE_NOAUTOCLOSE !ifndef MUI_FINISHPAGE_NOAUTOCLOSE
AutoCloseWindow true AutoCloseWindow true
!endif !endif
@ -1398,6 +1395,13 @@ Var MUI_TEMP2
!endif !endif
!endif !endif
!ifdef MUI_FINISHPAGE_RUN | MUI_FINISHPAGE_SHOWREADME
!ifndef MUI_FINISHPAGE_ABORTWARNINGCHECK
!define MUI_FINISHPAGE_ABORTWARNINGCHECK
Var MUI_NOABORTWARNING
!endif
!endif
Function "${PRE}" Function "${PRE}"
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1028 GetDlgItem $MUI_TEMP1 $HWNDPARENT 1028
@ -1425,6 +1429,10 @@ Var MUI_TEMP2
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "NextButtonText" "$(MUI_BUTTONTEXT_FINISH)" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "NextButtonText" "$(MUI_BUTTONTEXT_FINISH)"
!endif !endif
!ifdef MUI_FINISHPAGE_ABORTWARNINGCHECK
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "CancelEnabled" "1"
!endif
!ifdef MUI_FINISHPAGE_TITLE !ifdef MUI_FINISHPAGE_TITLE
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "${MUI_FINISHPAGE_TITLE}" !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "${MUI_FINISHPAGE_TITLE}"
!undef MUI_FINISHPAGE_TITLE !undef MUI_FINISHPAGE_TITLE
@ -1667,11 +1675,15 @@ Var MUI_TEMP2
!insertmacro MUI_FUNCTION_CUSTOM SHOW !insertmacro MUI_FUNCTION_CUSTOM SHOW
!ifdef MUI_FINISHPAGE_ABORTWARNINGCHECK
StrCpy $MUI_NOABORTWARNING "1" StrCpy $MUI_NOABORTWARNING "1"
!endif
!insertmacro MUI_INSTALLOPTIONS_SHOW_RETURN !insertmacro MUI_INSTALLOPTIONS_SHOW_RETURN
!ifdef MUI_FINISHPAGE_ABORTWARNINGCHECK
StrCpy $MUI_NOABORTWARNING "" StrCpy $MUI_NOABORTWARNING ""
!endif
GetDlgItem $MUI_TEMP1 $HWNDPARENT 1028 GetDlgItem $MUI_TEMP1 $HWNDPARENT 1028
ShowWindow $MUI_TEMP1 ${SW_NORMAL} ShowWindow $MUI_TEMP1 ${SW_NORMAL}

1
Contrib/Modern UI/ioSpecial.ini
View file

@ -1,7 +1,6 @@
[Settings] [Settings]
Rect=1044 Rect=1044
NumFields=3 NumFields=3
CancelEnabled=1
[Field 1] [Field 1]
Type=bitmap Type=bitmap
Left=0 Left=0

1
Contrib/Modern UI/ioSpecial3.ini
View file

@ -1,7 +1,6 @@
[Settings] [Settings]
Rect=1044 Rect=1044
NumFields=3 NumFields=3
CancelEnabled=1
[Field 1] [Field 1]
Type=bitmap Type=bitmap
Left=0 Left=0