From 70d8b6d67a7c97c5d5edbb3b575122314ca50991 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Thu, 7 Jan 2021 10:56:31 +0000
Subject: [PATCH] .tutorial

git-svn-id: svn://ultimatepp.org/upp/trunk@15651 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 tutorial/Gui02/Gui02.upp |  2 +-
 tutorial/Gui03/main.cpp  |  2 +-
 tutorial/Gui04/main.cpp  |  4 ++--
 tutorial/Gui06/main.cpp  |  8 ++++----
 tutorial/Gui09/main.cpp  |  2 +-
 tutorial/Gui12/main.cpp  | 42 ++++++++++++++++------------------------
 tutorial/Gui13/main.cpp  |  2 +-
 tutorial/Gui14/main.cpp  | 18 ++++++++---------
 tutorial/Gui15/main.cpp  |  2 +-
 tutorial/Gui16/dlg.lay   |  6 +++---
 tutorial/Gui17a/main.cpp |  2 +-
 tutorial/Gui17b/main.cpp |  2 +-
 tutorial/Gui18/main.cpp  |  2 +-
 tutorial/Gui19/main.cpp  |  2 +-
 tutorial/Gui20a/main.cpp |  8 ++------
 tutorial/Gui20b/main.cpp |  4 ++--
 tutorial/Gui20c/main.cpp |  2 +-
 tutorial/Gui21/Gui21.lay |  1 +
 tutorial/Gui22/main.cpp  | 24 +++++++++--------------
 tutorial/Gui23/Gui23.t   |  2 +-
 20 files changed, 60 insertions(+), 77 deletions(-)

diff --git a/tutorial/Gui02/Gui02.upp b/tutorial/Gui02/Gui02.upp
index 292c52c94..b6ce96d5d 100644
--- a/tutorial/Gui02/Gui02.upp
+++ b/tutorial/Gui02/Gui02.upp
@@ -1,4 +1,4 @@
-description " Application window\377";
+description "Application window\377";
 
 uses
 	CtrlLib;
diff --git a/tutorial/Gui03/main.cpp b/tutorial/Gui03/main.cpp
index aa04800ef..f83092c15 100644
--- a/tutorial/Gui03/main.cpp
+++ b/tutorial/Gui03/main.cpp
@@ -5,7 +5,7 @@ using namespace Upp;
 GUI_APP_MAIN
 {
 	TopWindow w;
-	w.Title("My application").MinimizeBox().Sizeable();
+	w.Title("My application").Zoomable().Sizeable();
 	w.SetRect(0, 0, 200, 300);
 	w.Run();
 }
diff --git a/tutorial/Gui04/main.cpp b/tutorial/Gui04/main.cpp
index 73df3ca68..fa1481464 100644
--- a/tutorial/Gui04/main.cpp
+++ b/tutorial/Gui04/main.cpp
@@ -4,7 +4,7 @@ using namespace Upp;
 
 struct MyAppWindow : TopWindow {
 	virtual void Paint(Draw& w) override {
-		w.DrawRect(GetSize(), SWhite);
+		w.DrawRect(GetSize(), SWhite());
 		w.DrawText(20, 20, "Hello world!", Arial(30), Magenta);
 	}
 
@@ -16,6 +16,6 @@ struct MyAppWindow : TopWindow {
 GUI_APP_MAIN
 {
 	MyAppWindow app;
-	app.SetRect(0, 0, 200, 100);
+	app.SetRect(0, 0, 400, 100);
 	app.Run();
 }
diff --git a/tutorial/Gui06/main.cpp b/tutorial/Gui06/main.cpp
index 0250a46be..f8786cde8 100644
--- a/tutorial/Gui06/main.cpp
+++ b/tutorial/Gui06/main.cpp
@@ -3,16 +3,16 @@
 using namespace Upp;
 
 struct MyAppWindow : TopWindow {
-	virtual void Close() override {
+	void Close() override {
 		delete this;
 	}
 
-	virtual void LeftDown(Point pos, dword flags) override {
+	void LeftDown(Point pos, dword flags) override {
 		(new MyAppWindow)->OpenMain();
 	}
 
-	virtual void Paint(Draw& w) override {
-		w.DrawRect(GetSize(), SWhite);
+	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/Gui09/main.cpp b/tutorial/Gui09/main.cpp
index 1219734b6..7b483e086 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), [&, i] { result = i; });
+			menu.Add(AsString(i), [=, &result] { result = i; });
 		menu.Separator();
 		menu.Add("Exit", [=] { Exit(); });
 		menu.Execute();
diff --git a/tutorial/Gui12/main.cpp b/tutorial/Gui12/main.cpp
index a62e008e7..04503e2f0 100644
--- a/tutorial/Gui12/main.cpp
+++ b/tutorial/Gui12/main.cpp
@@ -10,32 +10,24 @@ struct MyAppWindow : TopWindow {
 	MenuBar   menu;
 	ToolBar   tool;
 	StatusBar status;
-
-	void MenuFn() {
-		PromptOK("Fn activated!");
-	}
-
-	void BarFn() {
-		PromptOK("Fn2 activated!");
-	}
-
-	void Exit() {
-		if(PromptOKCancel("Exit MyApp?"))
-			Break();
-	}
+	
+	typedef MyAppWindow CLASSNAME; // so that we can use THISFN shortcut
 
 	void SubBar(Bar& bar) {
-		bar.AddMenu("Function", TutorialImg::Fn(), [=] { MenuFn(); })
-		   .Help("This invokes MenuFn method of tutorial example");
-		bar.Add(TutorialImg::Fn2(), [=] { BarFn(); })
-		   .Help("This invokes BarFn method of tutorial example");
-		bar.Add("Exit", TutorialImg::Exit(), [=] { Exit(); });
+		bar.AddMenu("Function", TutorialImg::Fn(), [=] { // AddMenu - only in menu
+			PromptOK("Fn activated!");
+		}).Help("This invokes MenuFn method of tutorial example");
+		bar.Add(TutorialImg::Fn2(), [=] { // does not have image - not in toolbar
+			PromptOK("Fn2 activated!");
+		}).Help("This invokes BarFn method of tutorial example");
+		bar.Add("Exit", TutorialImg::Exit(), [=] { // in both toolbar and menu
+			if(PromptOKCancel("Exit MyApp?"))
+				Break();
+		});
 	}
 
 	void MainMenu(Bar& bar) {
-		bar.Sub("Menu", [=](Bar& bar) {
-			SubBar(bar);
-		});
+		bar.Sub("Menu", THISFN(SubBar));
 	}
 
 	MyAppWindow() {
@@ -45,10 +37,10 @@ struct MyAppWindow : TopWindow {
 		AddFrame(tool);
 		AddFrame(status);
 		AddFrame(InsetFrame());
-		menu.Set([=](Bar& bar) { MainMenu(bar); });
-		menu.WhenHelp = status; // callback cast to fix it for older CLANG version in C++11
-		tool.Set([=](Bar& bar) { SubBar(bar); });
-		tool.WhenHelp = status; // callback cast to fix it for older CLANG version in C++11
+		menu.Set(THISFN(MainMenu));
+		menu.WhenHelp = status;
+		tool.Set([=](Bar& bar) { SubBar(bar); }); // equivalent to THISFN(SubBar)
+		tool.WhenHelp = status;
 	}
 };
 
diff --git a/tutorial/Gui13/main.cpp b/tutorial/Gui13/main.cpp
index 1bac7ee65..76b6bf723 100644
--- a/tutorial/Gui13/main.cpp
+++ b/tutorial/Gui13/main.cpp
@@ -7,7 +7,7 @@ struct MyAppWindow : TopWindow {
 
 	MyAppWindow() {
 		Title("My application with button");
-		Add(button.LeftPos(10, 100).TopPos(10, 30));
+		Add(button.LeftPos(10, 200).TopPos(10, 60));
 		button.SetLabel("Click me!");
 		button << [=] {
 			PromptOK("You have clicked the button!");
diff --git a/tutorial/Gui14/main.cpp b/tutorial/Gui14/main.cpp
index 03ebade53..eb379aad4 100644
--- a/tutorial/Gui14/main.cpp
+++ b/tutorial/Gui14/main.cpp
@@ -8,15 +8,15 @@ struct MyAppWindow : TopWindow {
 	MyAppWindow() {
 		Title("My application with button").Sizeable();
 		*this
-			<< lt.SetLabel("left-top").LeftPos(10, 100).TopPos(10, 20)
-			<< rt.SetLabel("right-top").RightPos(10, 100).TopPos(10, 20)
-			<< lb.SetLabel("left-bottom").LeftPos(10, 100).BottomPos(10, 20)
-			<< rb.SetLabel("right-bottom").RightPos(10, 100).BottomPos(10, 20)
-			<< lv.SetLabel("left-vsize").LeftPos(10, 100).VSizePos(40, 40)
-			<< ht.SetLabel("hsize-pos").HSizePos(120, 120).TopPos(10, 20)
-			<< hv.SetLabel("hsize-vsize").HSizePos(120, 120).VSizePos(40, 40)
-			<< cb.SetLabel("hcenter-bottom").HCenterPos(90).BottomPos(10, 20)
-			<< rc.SetLabel("right-vcenter").RightPos(10, 100).VCenterPos(40)
+			<< lt.SetLabel("left-top").LeftPos(10, 200).TopPos(10, 40)
+			<< rt.SetLabel("right-top").RightPos(10, 200).TopPos(10, 40)
+			<< lb.SetLabel("left-bottom").LeftPos(10, 200).BottomPos(10, 40)
+			<< rb.SetLabel("right-bottom").RightPos(10, 200).BottomPos(10, 40)
+			<< lv.SetLabel("left-vsize").LeftPos(10, 200).VSizePos(60, 60)
+			<< ht.SetLabel("hsize-pos").HSizePos(220, 220).TopPos(10, 40)
+			<< hv.SetLabel("hsize-vsize").HSizePos(220, 220).VSizePos(60, 60)
+			<< cb.SetLabel("hcenter-bottom").HCenterPos(200).BottomPos(10, 40)
+			<< rc.SetLabel("right-vcenter").RightPos(10, 200).VCenterPos(40)
 		;
 	}
 };
diff --git a/tutorial/Gui15/main.cpp b/tutorial/Gui15/main.cpp
index 3ec3dd42c..cc8d55a95 100644
--- a/tutorial/Gui15/main.cpp
+++ b/tutorial/Gui15/main.cpp
@@ -7,7 +7,7 @@ struct MyAppWindow : TopWindow {
 
 	MyAppWindow() {
 		Title("My application with font-zoomed button").Sizeable();
-		*this << button.SetLabel("Button").LeftPosZ(10, 64).TopPosZ(10, 24);
+		*this << button.SetLabel("Button").LeftPos(Zx(10), Zy(64)).TopPosZ(10, 24);
 	}
 };
 
diff --git a/tutorial/Gui16/dlg.lay b/tutorial/Gui16/dlg.lay
index ad7f93533..7f2429304 100644
--- a/tutorial/Gui16/dlg.lay
+++ b/tutorial/Gui16/dlg.lay
@@ -1,6 +1,6 @@
 LAYOUT(DlgLayout, 208, 64)
-	ITEM(Label, dv___0, SetLabel(t_("Label")).LeftPosZ(8, 36).TopPosZ(8, 19))
-	ITEM(EditString, text, LeftPosZ(48, 92).TopPosZ(8, 19))
-	ITEM(Option, option, SetLabel(t_("Option")).LeftPosZ(8, 108).TopPosZ(32, 15))
+	ITEM(Upp::Label, dv___0, SetLabel(t_("Label")).LeftPosZ(8, 36).TopPosZ(8, 19))
+	ITEM(Upp::EditString, text, LeftPosZ(48, 92).TopPosZ(8, 19))
+	ITEM(Upp::Option, option, SetLabel(t_("Option")).LeftPosZ(8, 108).TopPosZ(32, 15))
 END_LAYOUT
 
diff --git a/tutorial/Gui17a/main.cpp b/tutorial/Gui17a/main.cpp
index d8b8cc7af..f85fdab78 100644
--- a/tutorial/Gui17a/main.cpp
+++ b/tutorial/Gui17a/main.cpp
@@ -5,7 +5,7 @@ using namespace Upp;
 GUI_APP_MAIN
 {
 	TopWindow  app;
-	app.SetRect(0, 0, 200, 20);
+	app.SetRect(0, 0, Zx(200), Zy(20));
 	EditString text;
 	app.Add(text.TopPosZ(0, 20).HSizePos());
 
diff --git a/tutorial/Gui17b/main.cpp b/tutorial/Gui17b/main.cpp
index 9707c6826..f71ab69cc 100644
--- a/tutorial/Gui17b/main.cpp
+++ b/tutorial/Gui17b/main.cpp
@@ -5,7 +5,7 @@ using namespace Upp;
 GUI_APP_MAIN
 {
 	TopWindow  app;
-	app.SetRect(0, 0, 200, 20);
+	app.SetRect(0, 0, Zx(200), Zy(20));
 	EditString text;
 	app.Add(text.TopPosZ(0, 20).HSizePos());
 
diff --git a/tutorial/Gui18/main.cpp b/tutorial/Gui18/main.cpp
index 6b04ac5eb..158013980 100644
--- a/tutorial/Gui18/main.cpp
+++ b/tutorial/Gui18/main.cpp
@@ -5,7 +5,7 @@ using namespace Upp;
 GUI_APP_MAIN
 {
 	TopWindow  app;
-	app.SetRect(0, 0, 200, 20);
+	app.SetRect(0, 0, Zx(200), Zy(20));
 	EditDate  date;
 	app.Add(date.TopPosZ(0, 20).HSizePos());
 	app.Run();
diff --git a/tutorial/Gui19/main.cpp b/tutorial/Gui19/main.cpp
index 9a8232b96..682c52f37 100644
--- a/tutorial/Gui19/main.cpp
+++ b/tutorial/Gui19/main.cpp
@@ -5,7 +5,7 @@ using namespace Upp;
 GUI_APP_MAIN
 {
 	TopWindow  app;
-	app.SetRect(0, 0, 200, 60);
+	app.SetRect(0, 0, Zx(200), Zy(60));
 	EditDate  date1, date2, date3;
 	date1 <<= date2 <<= date3 <<= GetSysDate();
 	date1.ClearModify();
diff --git a/tutorial/Gui20a/main.cpp b/tutorial/Gui20a/main.cpp
index a6b56f136..0ef47f228 100644
--- a/tutorial/Gui20a/main.cpp
+++ b/tutorial/Gui20a/main.cpp
@@ -5,14 +5,10 @@ using namespace Upp;
 struct MyAppWindow : TopWindow {
 	Button exit;
 
-	void Exit() {
-		Break(999);
-	}
-
 	MyAppWindow() {
-		SetRect(0, 0, 100, 100);
+		SetRect(0, 0, Zx(100), Zy(100));
 		Add(exit.SetLabel("exit").LeftPosZ(10, 64).TopPosZ(10, 24));
-		exit << [=] { Exit(); };
+		exit << [=] { Break(999); };
 	}
 };
 
diff --git a/tutorial/Gui20b/main.cpp b/tutorial/Gui20b/main.cpp
index a9d4423ff..9c40e0740 100644
--- a/tutorial/Gui20b/main.cpp
+++ b/tutorial/Gui20b/main.cpp
@@ -6,9 +6,9 @@ struct MyAppWindow : TopWindow {
 	Button exit;
 
 	MyAppWindow() {
-		SetRect(0, 0, 100, 100);
+		SetRect(0, 0, Zx(100), Zy(100));
 		Add(exit.SetLabel("exit").LeftPosZ(10, 64).TopPosZ(10, 24));
-		exit <<= Breaker(999);
+		exit << Breaker(999);
 	}
 };
 
diff --git a/tutorial/Gui20c/main.cpp b/tutorial/Gui20c/main.cpp
index 2c696876e..e47c9593d 100644
--- a/tutorial/Gui20c/main.cpp
+++ b/tutorial/Gui20c/main.cpp
@@ -7,7 +7,7 @@ struct MyAppWindow : TopWindow {
 	EditDate date;
 
 	MyAppWindow() {
-		SetRect(0, 0, 200, 90);
+		SetRect(0, 0, Zx(200), Zy(90));
 		Add(date.LeftPosZ(10, 80).TopPosZ(10, 20));
 		Add(ok.SetLabel("OK").LeftPosZ(10, 64).TopPosZ(40, 24));
 		Add(cancel.SetLabel("Cancel").LeftPosZ(100, 64).TopPosZ(40, 24));
diff --git a/tutorial/Gui21/Gui21.lay b/tutorial/Gui21/Gui21.lay
index 0ff85f02d..c93222698 100644
--- a/tutorial/Gui21/Gui21.lay
+++ b/tutorial/Gui21/Gui21.lay
@@ -1,3 +1,4 @@
 LAYOUT(Gui21Layout, 200, 100)
 	ITEM(MyCtrl, myctrl, LeftPosZ(44, 120).TopPosZ(36, 28))
 END_LAYOUT
+
diff --git a/tutorial/Gui22/main.cpp b/tutorial/Gui22/main.cpp
index 7b159dab3..a16049a0a 100644
--- a/tutorial/Gui22/main.cpp
+++ b/tutorial/Gui22/main.cpp
@@ -5,14 +5,10 @@ using namespace Upp;
 struct NonModalDialog : public TopWindow {
 	Button b;
 
-	void DoClose() {
-		Close();
-	}
-
 	NonModalDialog() {
-		SetRect(0, 0, 200, 50);
+		SetRect(0, 0, Zx(200), Zy(50));
 		Add(b.SetLabel("Close non-modal dialog").SizePos());
-		b << [=] { DoClose(); };
+		b << [=] { Close(); };
 	}
 };
 
@@ -20,17 +16,15 @@ struct MainWindow : public TopWindow {
 	NonModalDialog dlg;
 	Button b;
 
-	void DoOpen() {
-		if(dlg.IsOpen())
-			dlg.Close();
-		else
-			dlg.Open(this);
-	}
-
 	MainWindow() {
-		SetRect(0, 0, 400, 100);
+		SetRect(0, 0, Zx(400), Zy(100));
 		Add(b.SetLabel("Open/close non-modal dialog").SizePos());
-		b << [=] { DoOpen(); };
+		b << [=] {
+			if(dlg.IsOpen())
+				dlg.Close();
+			else
+				dlg.Open(this);
+		};
 	}
 };
 
diff --git a/tutorial/Gui23/Gui23.t b/tutorial/Gui23/Gui23.t
index df19a2fdd..7c22cc1a9 100644
--- a/tutorial/Gui23/Gui23.t
+++ b/tutorial/Gui23/Gui23.t
@@ -17,7 +17,7 @@ trTR("Benim ba\305\237vurum")
 zhCN("\346\210\221\347\232\204\346\207\211\347\224\250\347\250\213\345\272\217")
 
 T_("Hello translation engine!")
-csCZ("Ahoj p\305\231eklada\304\215!")
+csCZ("Ahoj p\305\231eklada\304\215i!")
 deDE("Hallo \303\234bersetzungsmaschine!")
 esES("\302\241Hola motor de traducci\303\263n!")
 frFR("Bonjour le moteur de traduction!")