From fb57dfde771bedc3530718bb5d585f0f6fe1df13 Mon Sep 17 00:00:00 2001 From: joostverburg Date: Thu, 29 May 2008 21:17:13 +0000 Subject: [PATCH] fixed MUI_FINISHPAGE_CANCEL_ENABLED and removed some useless code git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5642 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI 2/Pages/Finish.nsh | 6 ++---- Contrib/Modern UI 2/Pages/Welcome.nsh | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Contrib/Modern UI 2/Pages/Finish.nsh b/Contrib/Modern UI 2/Pages/Finish.nsh index 45b67cc4..54ac816b 100644 --- a/Contrib/Modern UI 2/Pages/Finish.nsh +++ b/Contrib/Modern UI 2/Pages/Finish.nsh @@ -71,9 +71,7 @@ Finish page (implemented using nsDialogs) !endif !endif - !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAPS - !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp" - !endif + !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp" !macroend @@ -254,7 +252,7 @@ Finish page (implemented using nsDialogs) ;Enable cancel button if set in script !ifdef MUI_FINISHPAGE_CANCEL_ENABLED - EnableWindow $mui.Button.Next 1 + EnableWindow $mui.Button.Cancel 1 !endif ;Create dialog diff --git a/Contrib/Modern UI 2/Pages/Welcome.nsh b/Contrib/Modern UI 2/Pages/Welcome.nsh index a65917af..a2e80c89 100644 --- a/Contrib/Modern UI 2/Pages/Welcome.nsh +++ b/Contrib/Modern UI 2/Pages/Welcome.nsh @@ -23,9 +23,7 @@ Welcome page (implemented using nsDialogs) Var mui.WelcomePage.Text !endif - !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAPS - !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp" - !endif + !insertmacro MUI_DEFAULT MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp" !macroend