From 4aca101c3c0eb759e975aa20f978892e9437d270 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sat, 22 Dec 2007 10:13:29 +0000
Subject: [PATCH] fixed bug #1784470 - MUI_RESERVEFILE_INSTALLOPTIONS fails
 install build nicer error messages when moving from MUI to MUI2

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5432 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Modern UI 2/Deprecated.nsh | 72 ++++++++++++++++++++++++++++++
 Contrib/Modern UI 2/MUI2.nsh       |  1 +
 Contrib/Modern UI 2/SConscript     |  1 +
 3 files changed, 74 insertions(+)
 create mode 100644 Contrib/Modern UI 2/Deprecated.nsh

diff --git a/Contrib/Modern UI 2/Deprecated.nsh b/Contrib/Modern UI 2/Deprecated.nsh
new file mode 100644
index 00000000..754fd4d5
--- /dev/null
+++ b/Contrib/Modern UI 2/Deprecated.nsh	
@@ -0,0 +1,72 @@
+/*
+
+NSIS Modern User Interface
+Deprecated code - display warnings
+
+*/
+
+;--------------------------------
+;InstallOptions
+
+!define INSTALLOPTIONS_ERROR "MUI_INSTALLOPTIONS_* macros are no longer a part of MUI2. Include InstallOptions.nsh and use INSTALLOPTIONS_* macros instead. It is also recommended to upgrade to nsDialogs."
+
+!macro MUI_INSTALLOPTIONS_EXTRACT FILE
+
+  !error "${INSTALLOPTIONS_ERROR}"
+
+!macroend
+
+!macro MUI_INSTALLOPTIONS_EXTRACT_AS FILE FILENAME
+
+  !error "${INSTALLOPTIONS_ERROR}"
+
+!macroend
+
+!macro MUI_INSTALLOPTIONS_DISPLAY FILE
+
+  !error "${INSTALLOPTIONS_ERROR}"
+
+!macroend
+
+!macro MUI_INSTALLOPTIONS_DISPLAY_RETURN FILE
+
+  !error "${INSTALLOPTIONS_ERROR}"
+
+!macroend
+
+!macro MUI_INSTALLOPTIONS_INITDIALOG FILE
+
+  !error "${INSTALLOPTIONS_ERROR}"
+
+!macroend
+
+!macro MUI_INSTALLOPTIONS_SHOW
+
+  !error "${INSTALLOPTIONS_ERROR}"
+
+!macroend
+
+!macro MUI_INSTALLOPTIONS_SHOW_RETURN
+
+  !error "${INSTALLOPTIONS_ERROR}"
+
+!macroend
+
+!macro MUI_INSTALLOPTIONS_READ VAR FILE SECTION KEY
+
+  !error "${INSTALLOPTIONS_ERROR}"
+
+!macroend
+
+!macro MUI_INSTALLOPTIONS_WRITE FILE SECTION KEY VALUE
+
+  !error "${INSTALLOPTIONS_ERROR}"
+
+!macroend
+
+!macro MUI_RESERVEFILE_INSTALLOPTIONS
+
+  !define MUI_DOLLAR "$"
+  !error "MUI_RESERVEFILE_INSTALLOPTIONS is no longer supported as InstallOptions is no longer used by MUI2. Instead, use ReserveFile '${MUI_DOLLAR}{NSISDIR}\Plugins\InstallOptions.dll'. It is also recommended to upgrade to nsDialogs."
+
+!macroend
diff --git a/Contrib/Modern UI 2/MUI2.nsh b/Contrib/Modern UI 2/MUI2.nsh
index a5a4a60e..5e00f032 100644
--- a/Contrib/Modern UI 2/MUI2.nsh	
+++ b/Contrib/Modern UI 2/MUI2.nsh	
@@ -72,6 +72,7 @@ Copyright 
 ;--------------------------------
 ;MUI interface
 
+!include "Deprecated.nsh"
 !include "Interface.nsh"
 !include "Localization.nsh"
 !include "Pages.nsh"
diff --git a/Contrib/Modern UI 2/SConscript b/Contrib/Modern UI 2/SConscript
index e683570c..a3d90837 100644
--- a/Contrib/Modern UI 2/SConscript	
+++ b/Contrib/Modern UI 2/SConscript	
@@ -14,6 +14,7 @@ doc_images = Split("""
 """)
 
 contribs = Split("""
+	Deprecated.nsh
 	Interface.nsh
 	Localization.nsh
 	MUI2.nsh