dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

move check whether the MUI_INTERFACE macro is already included to the macro itself

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5246 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2007-08-18 12:56:26 +00:00
parent 842dcbf544
commit 17f376f671
1 changed files with 69 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Contrib/Modern UI/System.nsh
View file

@ -46,10 +46,7 @@ Var MUI_TEMP2
!warning "The MUI_PRODUCT and MUI_VERSION defines have been removed. Use a normal Name command now."
!endif
!ifndef MUI_INSERT_INTERFACE
!insertmacro MUI_INTERFACE
!define MUI_INSERT_INTERFACE
!endif
!insertmacro MUI_FUNCTION_GUIINIT
!insertmacro MUI_FUNCTION_ABORTWARNING
@ -114,6 +111,9 @@ Var MUI_TEMP2
!macro MUI_INTERFACE
!ifndef MUI_INTERFACE
!define MUI_INTERFACE
!ifdef MUI_INSERT_NSISCONF
!insertmacro MUI_NSISCONF
!endif
@ -187,6 +187,8 @@ Var MUI_TEMP2
!insertmacro MUI_DEFAULT MUI_ABORTWARNING_TEXT "$(MUI_TEXT_ABORTWARNING)"
!insertmacro MUI_DEFAULT MUI_UNABORTWARNING_TEXT "$(MUI_UNTEXT_ABORTWARNING)"
!endif
!macroend
;--------------------------------
@ -693,10 +695,7 @@ Var MUI_TEMP2
!macro MUI_PAGE_INIT
!ifndef MUI_INSERT_INTERFACE
!insertmacro MUI_INTERFACE
!define MUI_INSERT_INTERFACE
!endif
!insertmacro MUI_DEFAULT MUI_PAGE_UNINSTALLER_PREFIX ""
!insertmacro MUI_DEFAULT MUI_PAGE_UNINSTALLER_FUNCPREFIX ""