From 89a0bf4270b61a179f57ad2b16187e2ee01dd262 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 31 Aug 2015 10:13:04 +0000
Subject: [PATCH] reference: Cpp11 features

git-svn-id: svn://ultimatepp.org/upp/trunk@8880 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 reference/Callback/init             |  4 ++++
 reference/Cpp11/Cpp11.lay           |  6 ++++++
 reference/Cpp11/Cpp11.upp           | 12 ++++++++++++
 reference/Cpp11/init                |  4 ++++
 reference/Cpp11/main.cpp            | 24 ++++++++++++++++++++++++
 reference/build_info/build_info.cpp |  2 +-
 6 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 reference/Callback/init
 create mode 100644 reference/Cpp11/Cpp11.lay
 create mode 100644 reference/Cpp11/Cpp11.upp
 create mode 100644 reference/Cpp11/init
 create mode 100644 reference/Cpp11/main.cpp

diff --git a/reference/Callback/init b/reference/Callback/init
new file mode 100644
index 000000000..1b975dba4
--- /dev/null
+++ b/reference/Callback/init
@@ -0,0 +1,4 @@
+#ifndef _Callback_icpp_init_stub
+#define _Callback_icpp_init_stub
+#include "Core/init"
+#endif
diff --git a/reference/Cpp11/Cpp11.lay b/reference/Cpp11/Cpp11.lay
new file mode 100644
index 000000000..6b9d268a2
--- /dev/null
+++ b/reference/Cpp11/Cpp11.lay
@@ -0,0 +1,6 @@
+LAYOUT(MyAppLayout, 212, 196)
+	ITEM(ArrayCtrl, list, LeftPosZ(4, 96).TopPosZ(4, 188))
+	ITEM(EditInt, number, LeftPosZ(108, 96).TopPosZ(4, 19))
+	ITEM(Button, add, SetLabel(t_("Add")).LeftPosZ(148, 56).TopPosZ(28, 20))
+END_LAYOUT
+
diff --git a/reference/Cpp11/Cpp11.upp b/reference/Cpp11/Cpp11.upp
new file mode 100644
index 000000000..fbd501ae2
--- /dev/null
+++ b/reference/Cpp11/Cpp11.upp
@@ -0,0 +1,12 @@
+description "Demostrates C++11 features\377";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp,
+	Cpp11.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/Cpp11/init b/reference/Cpp11/init
new file mode 100644
index 000000000..bc7d72d30
--- /dev/null
+++ b/reference/Cpp11/init
@@ -0,0 +1,4 @@
+#ifndef _Cpp11_icpp_init_stub
+#define _Cpp11_icpp_init_stub
+#include "CtrlLib/init"
+#endif
diff --git a/reference/Cpp11/main.cpp b/reference/Cpp11/main.cpp
new file mode 100644
index 000000000..d2d544365
--- /dev/null
+++ b/reference/Cpp11/main.cpp
@@ -0,0 +1,24 @@
+#include "CtrlLib/CtrlLib.h"
+
+using namespace Upp;
+
+#define LAYOUTFILE <Cpp11/Cpp11.lay>
+#include <CtrlCore/lay.h>
+
+GUI_APP_MAIN
+{
+	WithMyAppLayout<TopWindow> dlg;
+	CtrlLayout(dlg, "C++11 demo");
+	dlg.list.NoHeader().AddColumn();
+	Vector<int> x = { 1, 2, 12, 34, 15, 11 };
+	for(auto i : x)
+		dlg.list.Add(i);
+	dlg.add << [&] {
+		if(dlg.list.Find(~dlg.number) < 0)
+			dlg.list.Add(~dlg.number);
+	};
+	dlg.list.WhenSel << [&] {
+		dlg.number <<= dlg.list.GetKey();
+	};
+	dlg.Execute();
+}
diff --git a/reference/build_info/build_info.cpp b/reference/build_info/build_info.cpp
index 1fae62627..4d8e2b4cc 100644
--- a/reference/build_info/build_info.cpp
+++ b/reference/build_info/build_info.cpp
@@ -19,7 +19,7 @@ CONSOLE_APP_MAIN
 #ifdef bmSVN_REVISION
 	LOG("Svn revision " << bmSVN_REVISION);
 #endif
-#ifdef bmSVN_REVISION
+#ifdef bmSVN_URL
 	LOG("Svn url " << bmSVN_URL);
 #endif
 }