From 2fc9ed8b957e6521621297fd188c5714c805fd37 Mon Sep 17 00:00:00 2001
From: joostverburg <joostverburg@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sun, 3 Nov 2002 12:50:06 +0000
Subject: [PATCH] macro system updates

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1570 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Modern UI/System.nsh          | 43 +++++++++------------------
 Examples/Modern UI/InstallOptions.nsi |  6 ++--
 2 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index d3ede5a0..910bfcf0 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -220,11 +220,15 @@
 !macro MUI_PAGECOMMANDS
  
   !verbose 3
+  
+  !ifndef MUI_CUSTOMPAGECOMMANDS
 
-  !insertmacro MUI_PAGECOMMAND_LICENSE
-  !insertmacro MUI_PAGECOMMAND_COMPONENTS
-  !insertmacro MUI_PAGECOMMAND_DIRECTORY
-  !insertmacro MUI_PAGECOMMAND_INSTFILES
+    !insertmacro MUI_PAGECOMMAND_LICENSE
+    !insertmacro MUI_PAGECOMMAND_COMPONENTS
+    !insertmacro MUI_PAGECOMMAND_DIRECTORY
+    !insertmacro MUI_PAGECOMMAND_INSTFILES
+  
+  !endif
   
   !verbose 4
   
@@ -279,9 +283,13 @@
 !macro MUI_UNPAGECOMMANDS
  
   !verbose 3
+  
+  !ifndef MUI_UNCUSTOMPAGECOMMANDS
 
-  !insertmacro MUI_UNPAGECOMMAND_CONFIRM
-  !insertmacro MUI_UNPAGECOMMAND_INSTFILES
+    !insertmacro MUI_UNPAGECOMMAND_CONFIRM
+    !insertmacro MUI_UNPAGECOMMAND_INSTFILES
+    
+  !endif
   
   !verbose 4
   
@@ -579,18 +587,6 @@
 
 !macroend
 
-!macro MUI_FUNCTIONS_CUSTOMPAGE_BASIC
-
-  !verbose 3
- 
-  !insertmacro MUI_FUNCTIONS_PAGES
-  !insertmacro MUI_FUNCTIONS_GUIINIT
-  !insertmacro MUI_FUNCTIONS_ABORTWARNING
-  
-  !verbose 4
-
-!macroend
-
 !macro MUI_UNFUNCTIONS_BASIC
 
   !verbose 3
@@ -603,17 +599,6 @@
 
 !macroend
 
-!macro MUI_UNFUNCTIONS_CUSTOMPAGE_BASIC
-
-  !verbose 3
-
-  !insertmacro MUI_UNFUNCTIONS_PAGES
-  !insertmacro MUI_UNFUNCTIONS_GUIINIT
-
-  !verbose 4
-
-!macroend
-
 !endif
 
 !verbose 4
diff --git a/Examples/Modern UI/InstallOptions.nsi b/Examples/Modern UI/InstallOptions.nsi
index 54197fc3..fe7b0805 100644
--- a/Examples/Modern UI/InstallOptions.nsi	
+++ b/Examples/Modern UI/InstallOptions.nsi	
@@ -30,6 +30,7 @@
   Name "${NAME} ${VERSION}"
   
   ;Page order
+  !define MUI_CUSTOMPAGECOMMANDS
   !insertmacro MUI_PAGECOMMAND_LICENSE
   Page custom SetCustomA
   Page custom SetCustomB
@@ -56,6 +57,7 @@
   LangString TEXT_IO_SUBTITLE ${LANG_ENGLISH} "Create your own dialog!"
   
   ;Uninstaller
+  !define MUI_UNCUSTOMPAGECOMMANDS
   !insertmacro MUI_UNPAGECOMMAND_CONFIRM
   !insertmacro MUI_UNPAGECOMMAND_INSTFILES
   
@@ -132,7 +134,7 @@ Function SetCustomC
   !insertmacro MUI_INSTALLOPTIONS_SHOW "ioC.ini"
 FunctionEnd
 
-!insertmacro MUI_FUNCTIONS_CUSTOMPAGE_BASIC
+!insertmacro MUI_FUNCTIONS_BASIC
 
 ;--------------------------------
 ;Uninstaller
@@ -153,6 +155,6 @@ SectionEnd
 ;--------------------------------
 ;Uninstaller Functions
 
-  !insertmacro MUI_UNFUNCTIONS_CUSTOMPAGE_BASIC
+  !insertmacro MUI_UNFUNCTIONS_BASIC
 
 ;eof
\ No newline at end of file