From ea66c2f3f15214229bbbc11cb74e61818ab80a79 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Thu, 25 Feb 2010 06:52:15 +0000
Subject: [PATCH] Syncing uppdev

git-svn-id: svn://ultimatepp.org/upp/trunk@2149 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppdev/ArrayCtrlCtrls/main.cpp         | 42 +++++++-------------------
 uppdev/AssistTest/AssistTest.upp       | 24 +++++++--------
 uppdev/AssistTest/app.tpp/all.i        |  0
 uppdev/AssistTest/init                 |  4 +++
 uppdev/AssistTest/main.cpp             |  7 +++++
 uppdev/ToolBarAsCtrl/ToolBarAsCtrl.upp | 23 +++++++-------
 uppdev/ToolBarAsCtrl/init              |  4 +++
 uppdev/ToolBarAsCtrl/main.cpp          |  2 ++
 uppdev/rtftest/rtftest.cpp             | 15 ++++++---
 9 files changed, 63 insertions(+), 58 deletions(-)
 create mode 100644 uppdev/AssistTest/app.tpp/all.i
 create mode 100644 uppdev/AssistTest/init
 create mode 100644 uppdev/ToolBarAsCtrl/init

diff --git a/uppdev/ArrayCtrlCtrls/main.cpp b/uppdev/ArrayCtrlCtrls/main.cpp
index fb6ed2a52..3109a12ab 100644
--- a/uppdev/ArrayCtrlCtrls/main.cpp
+++ b/uppdev/ArrayCtrlCtrls/main.cpp
@@ -2,44 +2,24 @@
 
 using namespace Upp;
 
-struct EditStringSpecial : EditString {
-	ArrayCtrl *GetArrayCtrl() {
-		for(Ctrl *q = GetParent(); q; q = q->GetParent())
-			if(ArrayCtrl *a = dynamic_cast<ArrayCtrl *>(q))
-				return a;
-		return NULL;
-	}
-	
-	static void DoMenu(EditStringSpecial *x) {
-		MenuBar bar;
-		x->StdBar(bar);
-		ArrayCtrl *a = x->GetArrayCtrl();
-		if(a) {
-			bar.Separator();
-			a->WhenBar(bar);
-		}
-		bar.Execute();
-	}
-
-	void MyBar(Bar& bar)
-	{
-		PostCallback(callback1(DoMenu, this));
-	}
-
-	typedef EditStringSpecial CLASSNAME;
-
-	EditStringSpecial() {
-		WhenBar = THISBACK(MyBar);		
-	}
-};
+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 a;
 	a.Appending().Removing();
-	a.AddColumn("Text").Ctrls<EditStringSpecial>();
+	a.AddColumn("Text").Ctrls(WidgetFactory);
 	for(int i = 0; i < 300; i++)
 		a.Add(AsString(i));
+	for(int i = 0; i < 300; i += 3)
+		a.GetCtrl(i, 0)->Disable();
+
 	a.SetLineCy(Draw::GetStdFontCy() + 8);
 
 	TopWindow app;
diff --git a/uppdev/AssistTest/AssistTest.upp b/uppdev/AssistTest/AssistTest.upp
index b5f0b70aa..7ed5b84d7 100644
--- a/uppdev/AssistTest/AssistTest.upp
+++ b/uppdev/AssistTest/AssistTest.upp
@@ -1,12 +1,12 @@
-uses
-	CtrlLib;
-
-file
-	"AssistTest.h"
-	, main.cpp
-	, "AssistTest.lay"
-
-;
-
-mainconfig
-	"" = "GUI";
+uses
+	CtrlLib;
+
+file
+	AssistTest.h,
+	app.tpp,
+	main.cpp,
+	AssistTest.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/uppdev/AssistTest/app.tpp/all.i b/uppdev/AssistTest/app.tpp/all.i
new file mode 100644
index 000000000..e69de29bb
diff --git a/uppdev/AssistTest/init b/uppdev/AssistTest/init
new file mode 100644
index 000000000..efbcfeb48
--- /dev/null
+++ b/uppdev/AssistTest/init
@@ -0,0 +1,4 @@
+#ifndef _AssistTest_icpp_init_stub
+#define _AssistTest_icpp_init_stub
+#include "CtrlLib/init"
+#endif
diff --git a/uppdev/AssistTest/main.cpp b/uppdev/AssistTest/main.cpp
index 8c2da069e..ddf7ce7d2 100644
--- a/uppdev/AssistTest/main.cpp
+++ b/uppdev/AssistTest/main.cpp
@@ -1,4 +1,6 @@
 #include "AssistTest.h"
+#define TOPICFILE <AssistTest/app.tpp/all.i>
+#include <Core/topic_group.h>
 
 AssistTest::AssistTest()
 {
@@ -11,3 +13,8 @@ GUI_APP_MAIN
 	l.GetPos
 	AssistTest().Run();
 }
+
+struct justatest {
+	typedef justatest CLASSNAME;
+typedef justatest CLASSNAME;
+};
\ No newline at end of file
diff --git a/uppdev/ToolBarAsCtrl/ToolBarAsCtrl.upp b/uppdev/ToolBarAsCtrl/ToolBarAsCtrl.upp
index 1e1bd9483..5e457f271 100644
--- a/uppdev/ToolBarAsCtrl/ToolBarAsCtrl.upp
+++ b/uppdev/ToolBarAsCtrl/ToolBarAsCtrl.upp
@@ -1,11 +1,12 @@
-uses
-	CtrlLib;
-
-file
-	ToolBarAsCtrl.h,
-	ToolBar.iml,
-	main.cpp,
-	ToolBarAsCtrl.lay;
-
-mainconfig
-	"" = "GUI";
+uses
+	CtrlLib;
+
+file
+	ToolBarAsCtrl.h,
+	ToolBar.iml,
+	main.cpp,
+	ToolBarAsCtrl.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/uppdev/ToolBarAsCtrl/init b/uppdev/ToolBarAsCtrl/init
new file mode 100644
index 000000000..2197b5cf8
--- /dev/null
+++ b/uppdev/ToolBarAsCtrl/init
@@ -0,0 +1,4 @@
+#ifndef _ToolBarAsCtrl_icpp_init_stub
+#define _ToolBarAsCtrl_icpp_init_stub
+#include "CtrlLib/init"
+#endif
diff --git a/uppdev/ToolBarAsCtrl/main.cpp b/uppdev/ToolBarAsCtrl/main.cpp
index c7bbc2c39..e64264b73 100644
--- a/uppdev/ToolBarAsCtrl/main.cpp
+++ b/uppdev/ToolBarAsCtrl/main.cpp
@@ -36,5 +36,7 @@ void ToolBarAsCtrl::Layout() {
 
 GUI_APP_MAIN
 {
+	GUI_PopUpEffect_Write(GUIEFFECT_NONE);
+	GUI_ToolTipDelay_Write(10);
 	ToolBarAsCtrl().Run();
 }
diff --git a/uppdev/rtftest/rtftest.cpp b/uppdev/rtftest/rtftest.cpp
index 34a08ee15..5b606bfc0 100644
--- a/uppdev/rtftest/rtftest.cpp
+++ b/uppdev/rtftest/rtftest.cpp
@@ -34,16 +34,21 @@ static void PaintLegend(Draw& draw, Rect& outer, const Vector<String>& linie, bo
 	fmt.Face(Font::ARIAL).Height(TEXT_HT);
 	for(int o = 0; o < order.GetCount(); o++) {
 		String l = linie[order[o]];
-		String ltext = l;
+		WString ltext = l.ToWString();
 
 		DrawingDraw ddraw(LINE_WD, TEXT_HT);
 		ddraw.DrawLine(0, TEXT_HT / 2, LINE_WD, TEXT_HT / 2, 5, LtGreen());
 
-		if(o)
-			legend_para.Cat("\xA0\xA0\xA0 ", fmt);
+		if(o) {
+			legend_para.Cat(WString(0xa0, 1), fmt);
+			legend_para.Cat(WString(0xa0, 1), fmt);
+			legend_para.Cat(WString(0xa0, 1), fmt);
+			legend_para.Cat(WString(' ', 1), fmt);
+		}
 
 		legend_para.Cat(CreateDrawingObject(ddraw, LINE_WD, TEXT_HT), fmt);
-		legend_para.Cat("\xA0\xA0", fmt);
+		legend_para.Cat(WString(0xa0, 1), fmt);
+		legend_para.Cat(WString(0xa0, 1), fmt);
 		for(int i = 0; i < ltext.GetLength(); i++)
 			if(ltext[i] == ' ')
 				ltext.Set(i, 0xA0);
@@ -53,6 +58,8 @@ static void PaintLegend(Draw& draw, Rect& outer, const Vector<String>& linie, bo
 	rtext.Cat(legend_para);
 	rtext.Normalize();
 
+	DDUMP(AsQTF(rtext));
+
 	int wd = min(rtext.GetWidth(), outer.Width() - 2 * LEG_INNER_GAP);
 	int ht = rtext.GetHeight(wd);