.reference

git-svn-id: svn://ultimatepp.org/upp/trunk@10266 f0d560ea-af0d-0410-9eb7-867de7ffcac7

reference/EventArgTarget/EventArgTarget.upp

@@ -1,11 +0,0 @@
-description "\"value\" return callback for local MenuBar\377";
-
-uses
-	CtrlLib;
-
-file
-	main.cpp;
-
-mainconfig
-	"" = "GUI";
-

reference/EventArgTarget/init

@@ -1,4 +0,0 @@
-#ifndef _EventArgTarget_icpp_init_stub
-#define _EventArgTarget_icpp_init_stub
-#include "CtrlLib/init"
-#endif

reference/MenuBarValue/MenuBarValue.upp

@@ -0,0 +1,11 @@
+description "\"value\" return from local MenuBar\377";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+

reference/MenuBarValue/init

@@ -0,0 +1,4 @@
+#ifndef _MenuBarValue_icpp_init_stub
+#define _MenuBarValue_icpp_init_stub
+#include "CtrlLib/init"
+#endif

reference/MenuBarValue/main.cpp

@@ -4,10 +4,10 @@ using namespace Upp;
 
 struct MyApp : TopWindow {
 	virtual void RightDown(Point p, dword keyflags) {
-		EventArgTarget<int> result;
+		int result = Null;
 		MenuBar menu;
 		for(int i = 0; i < 10; i++)
-			menu.Add(AsString(i), result[i]);
+			menu.Add(AsString(i), [=, &result] { result = i; });
 		menu.Execute();
 		if(IsNull(result))
 			PromptOK("Menu was cancelled");

reference/PromptRedirect/init

@@ -0,0 +1,4 @@
+#ifndef _PromptRedirect_icpp_init_stub
+#define _PromptRedirect_icpp_init_stub
+#include "CtrlLib/init"
+#endif

reference/PromptRedirect/main.cpp

@@ -2,7 +2,7 @@
 
 using namespace Upp;
 
-int MyPrompt(Callback1<const String&> WhenLink,
+int MyPrompt(Event<const String&> WhenLink,
              const char *title, const Image& iconbmp, const char *qtf, bool okcancel,
              const char *button1, const char *button2, const char *button3,
              int cx, Image im1, Image im2, Image im3)