From c9c77ab2379261344328d31ccac17e9a7d368a03 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 14 Oct 2020 14:36:29 +0000
Subject: [PATCH] .tutorial

git-svn-id: svn://ultimatepp.org/upp/trunk@15247 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 tutorial/Gui09/Gui09.upp | 2 +-
 tutorial/Gui09/main.cpp  | 2 +-
 tutorial/Gui13/main.cpp  | 6 +++---
 tutorial/Gui20c/main.cpp | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tutorial/Gui09/Gui09.upp b/tutorial/Gui09/Gui09.upp
index 94a5d5fd6..7c407ea8b 100644
--- a/tutorial/Gui09/Gui09.upp
+++ b/tutorial/Gui09/Gui09.upp
@@ -1,4 +1,4 @@
-description "Context menu alternative and using CallbackArgTarget\377";
+description "Context menu alternative\377";
 
 uses
 	CtrlLib;
diff --git a/tutorial/Gui09/main.cpp b/tutorial/Gui09/main.cpp
index e98b3be49..9f5a4aaa2 100644
--- a/tutorial/Gui09/main.cpp
+++ b/tutorial/Gui09/main.cpp
@@ -12,7 +12,7 @@ struct MyAppWindow : TopWindow {
 		int result = Null;
 		MenuBar menu;
 		for(int i = 0; i < 10; i++)
-			menu.Add(AsString(i), [=, &result] { result = i; });
+			menu.Add(AsString(i), [&] { result = i; });
 		menu.Separator();
 		menu.Add("Exit", [=] { Exit(); });
 		menu.Execute();
diff --git a/tutorial/Gui13/main.cpp b/tutorial/Gui13/main.cpp
index e6d0920ea..c7b78e077 100644
--- a/tutorial/Gui13/main.cpp
+++ b/tutorial/Gui13/main.cpp
@@ -5,15 +5,15 @@ using namespace Upp;
 struct MyAppWindow : TopWindow {
 	Button button;
 
-	void Click() { PromptOK("You have clicked the button!"); }
-
 	typedef MyAppWindow CLASSNAME;
 
 	MyAppWindow() {
 		Title("My application with button");
 		Add(button.LeftPos(10, 100).TopPos(10, 30));
 		button.SetLabel("Click me!");
-		button <<= THISBACK(Click);
+		button << [=] {
+			PromptOK("You have clicked the button!");
+		};
 	}
 };
 
diff --git a/tutorial/Gui20c/main.cpp b/tutorial/Gui20c/main.cpp
index 298dc5c5e..e6a4aa85a 100644
--- a/tutorial/Gui20c/main.cpp
+++ b/tutorial/Gui20c/main.cpp
@@ -12,8 +12,8 @@ struct MyApp : TopWindow {
 		Add(ok.SetLabel("OK").LeftPosZ(10, 64).TopPosZ(40, 24));
 		Add(cancel.SetLabel("Cancel").LeftPosZ(100, 64).TopPosZ(40, 24));
 
-		ok.Ok() <<= Acceptor(IDOK);
-		cancel.Cancel() <<= Rejector(IDCANCEL);
+		ok.Ok() << Acceptor(IDOK);
+		cancel.Cancel() << Rejector(IDCANCEL);
 	}
 };