diff --git a/reference/ArrayCtrlSorting/ArrayCtrlSorting.upp b/reference/ArrayCtrlSorting/ArrayCtrlSorting.upp new file mode 100644 index 000000000..d8b7ae78f --- /dev/null +++ b/reference/ArrayCtrlSorting/ArrayCtrlSorting.upp @@ -0,0 +1,11 @@ +description "Sorting ArrayCtrl by column clicks\377"; + +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..4a5153a83 --- /dev/null +++ b/reference/ArrayCtrlSorting/main.cpp @@ -0,0 +1,26 @@ +#include + +using namespace Upp; + +GUI_APP_MAIN +{ + ArrayCtrl list; + + list.AddColumn("Column1").Sorting(); // default sorting + list.AddColumn("Column2") // we provide compare function that sorts based on string length + .Sorting([](const Value& a, const Value& b) -> int { + return SgnCompare(AsString(a).GetCount(), AsString(b).GetCount()); + }); + + list.Add("Not sorted"); + + for(int i = 0; i < 100; i++) + list.Add((int)Random(), (int)Random(), (int)Random()); + + list.SortingFrom(1); + + TopWindow win; + win.Add(list.SizePos()); + + win.Run(); +} diff --git a/reference/MtRpcServer/MtRpcServer.cpp b/reference/MtRpcServer/MtRpcServer.cpp index 1e0a3a23f..e8d2cab97 100644 --- a/reference/MtRpcServer/MtRpcServer.cpp +++ b/reference/MtRpcServer/MtRpcServer.cpp @@ -42,7 +42,7 @@ private: void Process(int n) { INTERLOCKED { LOG("Process " << n << " started"); } - Mutex accept_mutex; + static Mutex accept_mutex; for(;;) {