From 222db2762828a6db9eaadc413b8053f42e9ff3b7 Mon Sep 17 00:00:00 2001
From: joostverburg <joostverburg@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sun, 2 Feb 2003 19:09:51 +0000
Subject: [PATCH] more welcome/finish page functions

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2104 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Modern UI/Readme.html | 14 ++++++++------
 Contrib/Modern UI/System.nsh  | 24 ++++++++++++++++++++----
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html
index 57140f4e..21ac5a86 100644
--- a/Contrib/Modern UI/Readme.html	
+++ b/Contrib/Modern UI/Readme.html	
@@ -457,7 +457,8 @@ MUI_CUSTOMFUNCTION_UNGUIINIT
 </p>
 <p class="text">
 <span class="bold">Welcome Page</span><br>
-MUI_CUSTOMFUNCTION_WELCOME
+MUI_CUSTOMFUNCTION_WELCOME_PRE<br>
+MUI_CUSTOMFUNCTION_WELCOME_SHOW
 </p>
 <p class="text">
 <span class="bold">License Page</span><br>
@@ -479,7 +480,7 @@ MUI_CUSTOMFUNCTION_DIRECTORY_LEAVE
 </p>
 <p class="text">
 <span class="bold">Start Menu Folder Page</span><br>
-MUI_CUSTOMFUNCTION_STARTMENU<br>
+MUI_CUSTOMFUNCTION_STARTMENU
 </p>
 <p class="text">
 <span class="bold">Install Files Page</span><br>
@@ -489,13 +490,14 @@ MUI_CUSTOMFUNCTION_INSTFILES_LEAVE
 </p>
 <p class="text">
 <span class="bold">Finish Page</span><br>
-MUI_CUSTOMFUNCTION_FINISH<br>
+MUI_CUSTOMFUNCTION_FINISH_PRE<br>
+MUI_CUSTOMFUNCTION_FINISH_SHOW
 </p>
 <p class="text">
 <span class="bold">Uninstaller - Confirm Page</span><br>
-MUI_UNCUSTOMFUNCTION_LICENSE_PRE<br>
-MUI_UNCUSTOMFUNCTION_LICENSE_SHOW<br>
-MUI_UNCUSTOMFUNCTION_LICENSE_LEAVE
+MUI_UNCUSTOMFUNCTION_CONFIRM_PRE<br>
+MUI_UNCUSTOMFUNCTION_CONFIRM_SHOW<br>
+MUI_UNCUSTOMFUNCTION_CONFIRM_LEAVE
 </p>
 <p class="text">
 <span class="bold">Uninstaller - Uninstall Files Page</span><br>
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index 2337d3f9..1e934e80 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -889,7 +889,7 @@
 
 !macroend
 
-!macro MUI_FUNCTIONS_WELCOMEPAGE SETWELCOME
+!macro MUI_FUNCTIONS_WELCOMEPAGE FUNCTION
 
   !ifndef MUI_NOVERBOSE
     !ifndef MUI_MANUALVERBOSE
@@ -897,7 +897,11 @@
     !endif
   !endif
 
-  Function "${SETWELCOME}"
+  Function "${FUNCTION}"
+
+    !ifdef MUI_CUSTOMFUNCTION_WELCOME_PRE
+      Call "${MUI_CUSTOMFUNCTION_WELCOME_PRE}"
+    !endif
   
     Push ${MUI_TEMP1}
     Push ${MUI_TEMP2}
@@ -906,7 +910,7 @@
       GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1028
       ShowWindow ${MUI_TEMP1} ${SW_HIDE}
 
-	  GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1256
+      GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1256
       ShowWindow ${MUI_TEMP1} ${SW_HIDE}
 
       GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1035
@@ -928,13 +932,17 @@
         
         GetDlgItem ${MUI_TEMP2} ${MUI_TEMP1} 1202
         SetStaticBkColor ${MUI_TEMP2} "${MUI_BGCOLOR}"
+
+	!ifdef MUI_CUSTOMFUNCTION_WELCOME_SHOW
+          Call "${MUI_CUSTOMFUNCTION_WELCOME_SHOW}"
+        !endif
   
       !insertmacro MUI_INSTALLOPTIONS_SHOW
       
       GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1028
       ShowWindow ${MUI_TEMP1} ${SW_NORMAL}
 
-	  GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1256
+      GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1256
       ShowWindow ${MUI_TEMP1} ${SW_NORMAL}
 
       GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1035
@@ -1170,6 +1178,10 @@
 
   Function "${FUNCTION}"
   
+    !ifdef MUI_CUSTOMFUNCTION_FINISH_PRE
+      Call "${MUI_CUSTOMFUNCTION_FINISH_PRE}"
+    !endif
+
     Push ${MUI_TEMP1}
     Push ${MUI_TEMP2}
     Push ${MUI_TEMP3}
@@ -1327,6 +1339,10 @@
           show:
         !endif
 
+      !ifdef MUI_CUSTOMFUNCTION_FINISH_SHOW
+        Call "${MUI_CUSTOMFUNCTION_FINISH_SHOW}"
+      !endif
+
       !insertmacro MUI_INSTALLOPTIONS_SHOW
       
       GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1028