Merge continued

git-svn-id: svn://ultimatepp.org/upp/trunk@10263 f0d560ea-af0d-0410-9eb7-867de7ffcac7

uppdev/Tutorial2/Tutorial2.h

@@ -0,0 +1,17 @@
+#ifndef _Tutorial2_Tutorial2_h
+#define _Tutorial2_Tutorial2_h
+
+#include <CtrlLib/CtrlLib.h>
+
+#define LAYOUTFILE <Tutorial2/Tutorial2.lay>
+#include <CtrlCore/lay.h>
+
+
+
+class Tutorial2 : public WithTutorial2Layout<TopWindow> {
+public:
+	typedef Tutorial2 CLASSNAME;
+	Tutorial2();
+};
+
+#endif

uppdev/Tutorial2/Tutorial2.lay

@@ -0,0 +1,2 @@
+LAYOUT(Tutorial2Layout, 200, 100)
+END_LAYOUT

uppdev/Tutorial2/Tutorial2.upp

@@ -0,0 +1,12 @@
+uses
+	CtrlLib;
+
+file
+	"Tutorial2.h"
+	, main.cpp
+	, "Tutorial2.lay"
+
+;
+
+mainconfig
+	"" = "GUI";

uppdev/Tutorial2/main.cpp

@@ -0,0 +1,13 @@
+#include "Tutorial2.h"
+
+
+
+Tutorial2::Tutorial2()
+{
+	CtrlLayout(*this, "Window title");
+}
+
+GUI_APP_MAIN
+{
+	Tutorial2().Run();
+}