From 2518c7c7b9b4f37899f9b5ae0cca9641fc0aff41 Mon Sep 17 00:00:00 2001
From: joostverburg <joostverburg@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Tue, 4 Nov 2003 21:41:50 +0000
Subject: [PATCH] only enable cancel on finish page when there are checkboxes,
 no compiler warning anymore

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3098 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Modern UI/System.nsh     | 28 ++++++++++++++++++++--------
 Contrib/Modern UI/ioSpecial.ini  |  1 -
 Contrib/Modern UI/ioSpecial3.ini |  1 -
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index 671719b0..a5b47397 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -258,7 +258,9 @@ Var MUI_TEMP2
 
 !macro MUI_ABORTWARNING
 
-  StrCmp $MUI_NOABORTWARNING "1" mui.quit
+  !ifdef MUI_FINISHPAGE_ABORTWARNINGCHECK
+    StrCmp $MUI_NOABORTWARNING "1" mui.quit
+  !endif
 
   !ifdef MUI_ABORTWARNING_TEXT
     MessageBox MB_YESNO|MB_ICONEXCLAMATION "${MUI_ABORTWARNING_TEXT}" IDYES mui.quit
@@ -1382,11 +1384,6 @@ Var MUI_TEMP2
     Var MUI_HWND
     !define MUI_VAR_HWND
   !endif
-  
-  !ifndef MUI_VAR_NOABORTWARNING
-    Var MUI_NOABORTWARNING
-    !define MUI_VAR_NOABORTWARNING
-  !endif
 
   !ifndef MUI_FINISHPAGE_NOAUTOCLOSE
     AutoCloseWindow true
@@ -1398,6 +1395,13 @@ Var MUI_TEMP2
     !endif
   !endif
 
+  !ifdef MUI_FINISHPAGE_RUN | MUI_FINISHPAGE_SHOWREADME
+    !ifndef MUI_FINISHPAGE_ABORTWARNINGCHECK
+      !define MUI_FINISHPAGE_ABORTWARNINGCHECK
+      Var MUI_NOABORTWARNING
+    !endif
+  !endif
+
   Function "${PRE}"
     
     GetDlgItem $MUI_TEMP1 $HWNDPARENT 1028
@@ -1425,6 +1429,10 @@ Var MUI_TEMP2
       !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "NextButtonText" "$(MUI_BUTTONTEXT_FINISH)"
     !endif
     
+    !ifdef MUI_FINISHPAGE_ABORTWARNINGCHECK
+      !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "CancelEnabled" "1"
+    !endif
+    
     !ifdef MUI_FINISHPAGE_TITLE
       !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "${MUI_FINISHPAGE_TITLE}"
       !undef MUI_FINISHPAGE_TITLE
@@ -1667,11 +1675,15 @@ Var MUI_TEMP2
 
     !insertmacro MUI_FUNCTION_CUSTOM SHOW
     
-    StrCpy $MUI_NOABORTWARNING "1"
+    !ifdef MUI_FINISHPAGE_ABORTWARNINGCHECK
+      StrCpy $MUI_NOABORTWARNING "1"
+    !endif
     
     !insertmacro MUI_INSTALLOPTIONS_SHOW_RETURN
     
-    StrCpy $MUI_NOABORTWARNING ""
+    !ifdef MUI_FINISHPAGE_ABORTWARNINGCHECK
+      StrCpy $MUI_NOABORTWARNING ""
+    !endif
     
     GetDlgItem $MUI_TEMP1 $HWNDPARENT 1028
     ShowWindow $MUI_TEMP1 ${SW_NORMAL}
diff --git a/Contrib/Modern UI/ioSpecial.ini b/Contrib/Modern UI/ioSpecial.ini
index fe6b5f79..fd601a22 100644
--- a/Contrib/Modern UI/ioSpecial.ini	
+++ b/Contrib/Modern UI/ioSpecial.ini	
@@ -1,7 +1,6 @@
 [Settings]
 Rect=1044
 NumFields=3
-CancelEnabled=1
 [Field 1]
 Type=bitmap
 Left=0
diff --git a/Contrib/Modern UI/ioSpecial3.ini b/Contrib/Modern UI/ioSpecial3.ini
index 823bc170..05ae8f72 100644
--- a/Contrib/Modern UI/ioSpecial3.ini	
+++ b/Contrib/Modern UI/ioSpecial3.ini	
@@ -1,7 +1,6 @@
 [Settings]
 Rect=1044
 NumFields=3
-CancelEnabled=1
 [Field 1]
 Type=bitmap
 Left=0