From: <ki...@us...> - 2008-04-22 13:51:52
|
Revision: 5606 http://nsis.svn.sourceforge.net/nsis/?rev=5606&view=rev Author: kichik Date: 2008-04-22 06:51:59 -0700 (Tue, 22 Apr 2008) Log Message: ----------- fixed bug #1947388 - ${NSD_OnBack} doesn't work Modified Paths: -------------- NSIS/trunk/Contrib/nsDialogs/nsDialogs.nsh Modified: NSIS/trunk/Contrib/nsDialogs/nsDialogs.nsh =================================================================== --- NSIS/trunk/Contrib/nsDialogs/nsDialogs.nsh 2008-04-22 13:42:01 UTC (rev 5605) +++ NSIS/trunk/Contrib/nsDialogs/nsDialogs.nsh 2008-04-22 13:51:59 UTC (rev 5606) @@ -278,7 +278,7 @@ !insertmacro __NSD_DefineControl DropList !insertmacro __NSD_DefineControl ListBox -!macro __NSD_OnEvent EVENT HWND FUNCTION +!macro __NSD_OnControlEvent EVENT HWND FUNCTION Push $0 Push $1 @@ -293,17 +293,34 @@ !macroend -!macro __NSD_DefineCallback EVENT +!macro __NSD_DefineControlCallback EVENT - !define NSD_On${EVENT} `!insertmacro __NSD_OnEvent ${EVENT}` + !define NSD_On${EVENT} `!insertmacro __NSD_OnControlEvent ${EVENT}` !macroend -!insertmacro __NSD_DefineCallback Click -!insertmacro __NSD_DefineCallback Change -!insertmacro __NSD_DefineCallback Notify -!insertmacro __NSD_DefineCallback Back +!macro __NSD_OnDialogEvent EVENT FUNCTION + Push $0 + + GetFunctionAddress $0 "${FUNCTION}" + nsDialogs::On${EVENT} /NOUNLOAD $0 + + Pop $0 + +!macroend + +!macro __NSD_DefineDialogCallback EVENT + + !define NSD_On${EVENT} `!insertmacro __NSD_OnDialogEvent ${EVENT}` + +!macroend + +!insertmacro __NSD_DefineControlCallback Click +!insertmacro __NSD_DefineControlCallback Change +!insertmacro __NSD_DefineControlCallback Notify +!insertmacro __NSD_DefineDialogCallback Back + !macro _NSD_AddStyle CONTROL STYLE Push $0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |