From 8ac31e2613412b4d7fb2c2ac29448d698aa0a40f Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 25 Aug 2009 07:57:23 +0000
Subject: [PATCH] syncing uppdev

git-svn-id: svn://ultimatepp.org/upp/trunk@1534 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppdev/Layout/Layout.lay | 4 ++++
 uppdev/Layout/main.cpp   | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/uppdev/Layout/Layout.lay b/uppdev/Layout/Layout.lay
index 2cb0b02df..4b276a3af 100644
--- a/uppdev/Layout/Layout.lay
+++ b/uppdev/Layout/Layout.lay
@@ -1,4 +1,8 @@
 LAYOUT(LayoutLayout, 200, 404)
 	ITEM(Label, dv___0, SetLabel(t_("èwskèwsk")).LeftPosZ(28, 112).TopPosZ(264, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).Tip(t_("This is OK!")).LeftPosZ(28, 144).TopPosZ(320, 80))
+	ITEM(WithDropChoice<EditString>, tipper, Tip(t_("Just a tip!")).LeftPosZ(12, 184).TopPosZ(52, 19))
+	ITEM(EditString, aaa, Tip(t_("Another tip")).LeftPosZ(12, 64).TopPosZ(80, 19))
+	ITEM(DropList, dl, Tip(t_("Some tip is here!")).LeftPosZ(12, 64).TopPosZ(108, 19))
 END_LAYOUT
 
diff --git a/uppdev/Layout/main.cpp b/uppdev/Layout/main.cpp
index c0f0c5bb1..b65a2e727 100644
--- a/uppdev/Layout/main.cpp
+++ b/uppdev/Layout/main.cpp
@@ -3,8 +3,9 @@
 Layout::Layout()
 {
 	CtrlLayoutOK(*this, "Test");
+	dl.Tip("Tip!");
 }
 
 GUI_APP_MAIN {
-	Layout().Run();�wsk
+	Layout().Run();
 }
\ No newline at end of file