From 707a7864dec9fd570a0450ac1ea04a4647581330 Mon Sep 17 00:00:00 2001
From: klugier <klugier@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 16 Nov 2020 22:27:13 +0000
Subject: [PATCH] Tutorial: Removed depricated CLASSNAME from GUI tutorials.

git-svn-id: svn://ultimatepp.org/upp/trunk@15432 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 tutorial/Gui04/main.cpp |  2 +-
 tutorial/Gui05/main.cpp |  6 +++---
 tutorial/Gui06/main.cpp |  6 +++---
 tutorial/Gui08/main.cpp |  2 +-
 tutorial/Gui09/main.cpp |  2 +-
 tutorial/Gui11/main.cpp | 14 ++++++--------
 tutorial/Gui12/main.cpp | 16 ++++++++--------
 7 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/tutorial/Gui04/main.cpp b/tutorial/Gui04/main.cpp
index 4cda881e8..73df3ca68 100644
--- a/tutorial/Gui04/main.cpp
+++ b/tutorial/Gui04/main.cpp
@@ -3,7 +3,7 @@
 using namespace Upp;
 
 struct MyAppWindow : TopWindow {
-	virtual void Paint(Draw& w) {
+	virtual void Paint(Draw& w) override {
 		w.DrawRect(GetSize(), SWhite);
 		w.DrawText(20, 20, "Hello world!", Arial(30), Magenta);
 	}
diff --git a/tutorial/Gui05/main.cpp b/tutorial/Gui05/main.cpp
index 4b10f6fe1..af56bfc5f 100644
--- a/tutorial/Gui05/main.cpp
+++ b/tutorial/Gui05/main.cpp
@@ -6,17 +6,17 @@ struct MyAppWindow : TopWindow {
 	Point  p;
 	String text;
 
-	virtual void LeftDown(Point pos, dword flags) {
+	virtual void LeftDown(Point pos, dword flags) override {
 		p = pos;
 		Refresh();
 	}
 
-	virtual void MouseMove(Point pos, dword flags) {
+	virtual void MouseMove(Point pos, dword flags) override {
 		text = Format("[%d:%d]", pos.x, pos.y);
 		Refresh();
 	}
 
-	virtual void Paint(Draw& w) {
+	virtual void Paint(Draw& w) override {
 		w.DrawRect(GetSize(), SWhite);
 		w.DrawText(p.x, p.y, text, Arial(20), Magenta);
 	}
diff --git a/tutorial/Gui06/main.cpp b/tutorial/Gui06/main.cpp
index 0eaa99e6e..0250a46be 100644
--- a/tutorial/Gui06/main.cpp
+++ b/tutorial/Gui06/main.cpp
@@ -3,15 +3,15 @@
 using namespace Upp;
 
 struct MyAppWindow : TopWindow {
-	virtual void Close() {
+	virtual void Close() override {
 		delete this;
 	}
 
-	virtual void LeftDown(Point pos, dword flags) {
+	virtual void LeftDown(Point pos, dword flags) override {
 		(new MyAppWindow)->OpenMain();
 	}
 
-	virtual void Paint(Draw& w) {
+	virtual void Paint(Draw& w) override {
 		w.DrawRect(GetSize(), SWhite);
 		w.DrawText(0, 0, "Click the view area to open next window!", Arial(20));
 	}
diff --git a/tutorial/Gui08/main.cpp b/tutorial/Gui08/main.cpp
index 3e24f638d..39e10dcf6 100644
--- a/tutorial/Gui08/main.cpp
+++ b/tutorial/Gui08/main.cpp
@@ -8,7 +8,7 @@ struct MyAppWindow : TopWindow {
 			Break();
 	}
 
-	void RightDown(Point, dword) {
+	virtual void RightDown(Point, dword) override {
 		MenuBar::Execute(
 			[=](Bar& bar) {
 				bar.Add("Exit", [=] { Exit(); });
diff --git a/tutorial/Gui09/main.cpp b/tutorial/Gui09/main.cpp
index 9f5a4aaa2..791194667 100644
--- a/tutorial/Gui09/main.cpp
+++ b/tutorial/Gui09/main.cpp
@@ -8,7 +8,7 @@ struct MyAppWindow : TopWindow {
 			Break();
 	}
 
-	void RightDown(Point, dword) {
+	virtual void RightDown(Point, dword) override {
 		int result = Null;
 		MenuBar menu;
 		for(int i = 0; i < 10; i++)
diff --git a/tutorial/Gui11/main.cpp b/tutorial/Gui11/main.cpp
index 16752b002..2eedcb929 100644
--- a/tutorial/Gui11/main.cpp
+++ b/tutorial/Gui11/main.cpp
@@ -24,23 +24,21 @@ struct MyAppWindow : TopWindow {
 	}
 
 	void SubBar(Bar& bar) {
-		bar.AddMenu("Function", TutorialImg::Fn(), THISBACK(MenuFn));
-		bar.Add(TutorialImg::Fn2(), THISBACK(BarFn));
-		bar.Add("Exit", TutorialImg::Exit(), THISBACK(Exit));
+		bar.AddMenu("Function", TutorialImg::Fn(), [=] { MenuFn(); });
+		bar.Add(TutorialImg::Fn2(), [=] { BarFn(); });
+		bar.Add("Exit", TutorialImg::Exit(), [=] { Exit(); });
 	}
 
 	void MainMenu(Bar& bar) {
-		bar.Add("Menu", THISBACK(SubBar));
+		bar.Sub("Menu", [=](Bar& bar) { SubBar(bar); });
 	}
 
-	typedef MyAppWindow CLASSNAME;
-
 	MyAppWindow() {
 		Title("My application with bars").Sizeable();
 		AddFrame(menu);
 		AddFrame(tool);
-		menu.Set(THISBACK(MainMenu));
-		tool.Set(THISBACK(SubBar));
+		menu.Set([=](Bar& bar) { MainMenu(bar); });
+		tool.Set([=](Bar& bar) { SubBar(bar); });
 	}
 };
 
diff --git a/tutorial/Gui12/main.cpp b/tutorial/Gui12/main.cpp
index cf20873fa..a62e008e7 100644
--- a/tutorial/Gui12/main.cpp
+++ b/tutorial/Gui12/main.cpp
@@ -25,19 +25,19 @@ struct MyAppWindow : TopWindow {
 	}
 
 	void SubBar(Bar& bar) {
-		bar.AddMenu("Function", TutorialImg::Fn(), THISBACK(MenuFn))
+		bar.AddMenu("Function", TutorialImg::Fn(), [=] { MenuFn(); })
 		   .Help("This invokes MenuFn method of tutorial example");
-		bar.Add(TutorialImg::Fn2(), THISBACK(BarFn))
+		bar.Add(TutorialImg::Fn2(), [=] { BarFn(); })
 		   .Help("This invokes BarFn method of tutorial example");
-		bar.Add("Exit", TutorialImg::Exit(), THISBACK(Exit));
+		bar.Add("Exit", TutorialImg::Exit(), [=] { Exit(); });
 	}
 
 	void MainMenu(Bar& bar) {
-		bar.Add("Menu", THISBACK(SubBar));
+		bar.Sub("Menu", [=](Bar& bar) {
+			SubBar(bar);
+		});
 	}
 
-	typedef MyAppWindow CLASSNAME;
-
 	MyAppWindow() {
 		Title("My application with bars").Sizeable();
 		AddFrame(menu);
@@ -45,9 +45,9 @@ struct MyAppWindow : TopWindow {
 		AddFrame(tool);
 		AddFrame(status);
 		AddFrame(InsetFrame());
-		menu.Set(THISBACK(MainMenu));
+		menu.Set([=](Bar& bar) { MainMenu(bar); });
 		menu.WhenHelp = status; // callback cast to fix it for older CLANG version in C++11
-		tool.Set(THISBACK(SubBar)); 
+		tool.Set([=](Bar& bar) { SubBar(bar); });
 		tool.WhenHelp = status; // callback cast to fix it for older CLANG version in C++11
 	}
 };