From 39e6d995cbd2fbf4b43f85c07dd03258a1e3d710 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 7 Oct 2017 09:49:43 +0000
Subject: [PATCH] .reference

git-svn-id: svn://ultimatepp.org/upp/trunk@11351 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 reference/ArrayCtrlCtrls/ArrayCtrlCtrls.upp   |  2 +-
 reference/ArrayCtrlCtrls/main.cpp             | 28 ++++++++++++---
 reference/ArrayCtrlCtrls2/ArrayCtrlCtrls2.upp | 11 ------
 reference/ArrayCtrlCtrls2/main.cpp            | 30 ----------------
 .../ArrayCtrlSorting/ArrayCtrlSorting.upp     |  9 +++++
 reference/ArrayCtrlSorting/main.cpp           | 35 +++++++++++++++++++
 6 files changed, 68 insertions(+), 47 deletions(-)
 delete mode 100644 reference/ArrayCtrlCtrls2/ArrayCtrlCtrls2.upp
 delete mode 100644 reference/ArrayCtrlCtrls2/main.cpp
 create mode 100644 reference/ArrayCtrlSorting/ArrayCtrlSorting.upp
 create mode 100644 reference/ArrayCtrlSorting/main.cpp

diff --git a/reference/ArrayCtrlCtrls/ArrayCtrlCtrls.upp b/reference/ArrayCtrlCtrls/ArrayCtrlCtrls.upp
index b92a9136d..5b175c4f9 100644
--- a/reference/ArrayCtrlCtrls/ArrayCtrlCtrls.upp
+++ b/reference/ArrayCtrlCtrls/ArrayCtrlCtrls.upp
@@ -1,4 +1,4 @@
-description "Columns with widget class in ArrayCtrl";
+description "Columns with widget factory - GetCtrl, different widgets in single column\377";
 
 uses
 	CtrlLib;
diff --git a/reference/ArrayCtrlCtrls/main.cpp b/reference/ArrayCtrlCtrls/main.cpp
index cc2963325..d9b156a85 100644
--- a/reference/ArrayCtrlCtrls/main.cpp
+++ b/reference/ArrayCtrlCtrls/main.cpp
@@ -4,14 +4,32 @@ using namespace Upp;
 
 GUI_APP_MAIN
 {
-	ArrayCtrl a;
-	a.AddColumn("Text").Ctrls<EditString>();
+	ArrayCtrl list;
+	list.AddColumn("Trivial").Ctrls<EditString>(); // specify type of widget as template argument
+	list.AddColumn("Factory").With( // class factory creates widget - allows customization of widget
+		[](One<Ctrl>& x) {
+			x.Create<Option>().NoWantFocus();
+		}
+	);
+	list.AddColumn("Lined").WithLined( // passes the row index as the first argument
+		[](int line, One<Ctrl>& x)
+		{
+			if(line & 1)
+				x.Create<EditString>();
+			else
+				x.Create<Option>().SetLabel("Line " + AsString(line));
+		}
+	);
+
 	for(int i = 0; i < 300; i++)
-		a.Add(AsString(i));
-	a.SetLineCy(Draw::GetStdFontCy() + 8);
+		list.Add(AsString(i), i & 1, AsString(i));
+	for(int i = 1; i < 300; i += 3)
+		list.GetCtrl(i, 0)->Disable();
+
+	list.SetLineCy(Draw::GetStdFontCy() + DPI(8));
 
 	TopWindow app;
-	app.Add(a.SizePos());
+	app.Add(list.SizePos());
 	app.Sizeable();
 	app.Run();
 }
diff --git a/reference/ArrayCtrlCtrls2/ArrayCtrlCtrls2.upp b/reference/ArrayCtrlCtrls2/ArrayCtrlCtrls2.upp
deleted file mode 100644
index 5b175c4f9..000000000
--- a/reference/ArrayCtrlCtrls2/ArrayCtrlCtrls2.upp
+++ /dev/null
@@ -1,11 +0,0 @@
-description "Columns with widget factory - GetCtrl, different widgets in single column\377";
-
-uses
-	CtrlLib;
-
-file
-	main.cpp;
-
-mainconfig
-	"" = "GUI";
-
diff --git a/reference/ArrayCtrlCtrls2/main.cpp b/reference/ArrayCtrlCtrls2/main.cpp
deleted file mode 100644
index affc3d050..000000000
--- a/reference/ArrayCtrlCtrls2/main.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <CtrlLib/CtrlLib.h>
-
-using namespace Upp;
-
-void WidgetFactory(int line, One<Ctrl>& x)
-{
-	if(line & 1)
-		x.Create<EditString>();
-	else
-		x.Create<Option>().SetLabel("Line " + AsString(line));
-}
-
-GUI_APP_MAIN
-{
-	ArrayCtrl list;
-	list.Appending().Removing();
-	list.AddColumn("Text").Ctrls(WidgetFactory);
-
-	for(int i = 0; i < 300; i++)
-		list.Add(AsString(i));
-	for(int i = 1; i < 300; i += 3)
-		list.GetCtrl(i, 0)->Disable();
-
-	list.SetLineCy(Draw::GetStdFontCy() + 8);
-
-	TopWindow app;
-	app.Add(list.SizePos());
-	app.Sizeable();
-	app.Run();
-}
diff --git a/reference/ArrayCtrlSorting/ArrayCtrlSorting.upp b/reference/ArrayCtrlSorting/ArrayCtrlSorting.upp
new file mode 100644
index 000000000..5872304d3
--- /dev/null
+++ b/reference/ArrayCtrlSorting/ArrayCtrlSorting.upp
@@ -0,0 +1,9 @@
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/ArrayCtrlSorting/main.cpp b/reference/ArrayCtrlSorting/main.cpp
new file mode 100644
index 000000000..3a59e3e91
--- /dev/null
+++ b/reference/ArrayCtrlSorting/main.cpp
@@ -0,0 +1,35 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+GUI_APP_MAIN
+{
+	ArrayCtrl list;
+	list.AddColumn("Trivial").Sorting();
+
+	list.AddColumn("With function")
+	.SortingBy( // sort with sorting function
+		[](int a, int b) -> int {
+			int q = SgnCompare(a % 100, b % 100);
+			if(q) return q;
+			return SgnCompare(a, b);
+		}
+	)
+	.SortDefault(); // set his column to be the initial sorting column;
+	
+	list.AddColumn("Line comparison").SortingLined( // row indices passed to predicate
+		[&list](int i, int j) -> bool {
+			return int(list.Get(i, 0)) + int(list.Get(i, 1)) // sort by sum of first two columns
+			       < int(list.Get(i, 0)) + int(list.Get(i, 1));
+		}
+	);
+
+	for(int i = 0; i < 300; i++)
+		list.Add((int)Random(1000), (int)Random(10000), 0);
+
+	TopWindow app;
+	app.Add(list.SizePos());
+	app.Sizeable();
+	list.DoColumnSort(); // sort by current sorting column (which is "With function" column because of SortDefault
+	app.Run();
+}