From 5fe86cd0e108889125c64f49fbd43b3d0b32a293 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 19 Oct 2009 08:54:51 +0000
Subject: [PATCH] Syncing uppdev

git-svn-id: svn://ultimatepp.org/upp/trunk@1636 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppdev/Menu/menu.cpp           |  35 +++++++++--
 uppdev/Rep/Rep.upp             |  21 ++++---
 uppdev/Rep/init                |   7 +++
 uppdev/Rep/main.cpp            | 107 ++++++++++++++++++++++-----------
 uppdev/alloctest/alloctest.cpp |   9 +++
 uppdev/alloctest/alloctest.upp |   9 +++
 6 files changed, 138 insertions(+), 50 deletions(-)
 create mode 100644 uppdev/Rep/init
 create mode 100644 uppdev/alloctest/alloctest.cpp
 create mode 100644 uppdev/alloctest/alloctest.upp

diff --git a/uppdev/Menu/menu.cpp b/uppdev/Menu/menu.cpp
index b856e91f0..6e7d72422 100644
--- a/uppdev/Menu/menu.cpp
+++ b/uppdev/Menu/menu.cpp
@@ -5,6 +5,11 @@ using namespace Upp;
 struct App : public TopWindow {
 	bool numbers_enabled;
 	EditString test;
+	Point p;
+	ArrayCtrl list;
+	
+	virtual void MouseMove(Point p, dword keyflags);
+	virtual void Paint(Draw& w);
 
 	void Action2(int a, int b) { PromptOK(AsString(a) + AsString(b)); }
 
@@ -65,12 +70,15 @@ struct App : public TopWindow {
 		MainBar(bar);
 		bar.Execute();
 	}
-
-	virtual void LeftDown(Point p, dword)
+	
+	void CloseSubMenu()
 	{
-		MenuBar bar;
-		BigMenu(bar);
-		bar.Execute();
+		list.Add("Close");
+	}
+	
+	void OpenSubMenu()
+	{
+		list.Add("Open");
 	}
 
 	MenuBar menu;
@@ -82,9 +90,26 @@ struct App : public TopWindow {
 		numbers_enabled = true;
 		AddFrame(menu);
 		menu.Set(THISBACK(MainBar));
+		menu.WhenSubMenuClose = THISBACK(CloseSubMenu);
+		menu.WhenSubMenuOpen = THISBACK(OpenSubMenu);
+		list.AddColumn();
+		Add(list.RightPos(0, 200).VSizePos());
 	}
 };
 
+void App::MouseMove(Point p, dword keyflags)
+{
+	this->p = p;
+	Refresh();
+}
+
+void App::Paint(Draw& w)
+{
+	w.DrawRect(GetSize(), White());
+	w.DrawText(100, 100, AsString(p));
+}
+
+
 GUI_APP_MAIN
 {
 	App().Run();
diff --git a/uppdev/Rep/Rep.upp b/uppdev/Rep/Rep.upp
index 3dad2345c..9ac7910e4 100644
--- a/uppdev/Rep/Rep.upp
+++ b/uppdev/Rep/Rep.upp
@@ -1,9 +1,12 @@
-uses
-	CtrlLib,
-	Report;
-
-file
-	main.cpp;
-
-mainconfig
-	"" = "GUI";
+uses
+	CtrlLib,
+	Report,
+	PdfDraw,
+	Painter;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/uppdev/Rep/init b/uppdev/Rep/init
new file mode 100644
index 000000000..5e5df2d53
--- /dev/null
+++ b/uppdev/Rep/init
@@ -0,0 +1,7 @@
+#ifndef _Rep_icpp_init_stub
+#define _Rep_icpp_init_stub
+#include "CtrlLib/init"
+#include "Report/init"
+#include "PdfDraw/init"
+#include "Painter/init"
+#endif
diff --git a/uppdev/Rep/main.cpp b/uppdev/Rep/main.cpp
index 8aacdfcae..24518e740 100644
--- a/uppdev/Rep/main.cpp
+++ b/uppdev/Rep/main.cpp
@@ -1,42 +1,77 @@
 #include <CtrlLib/CtrlLib.h>
 #include <Report/Report.h>
 
+using namespace Upp;
+
 GUI_APP_MAIN
 {
-	String qtf;
-	Vector<String> data;
-	int rows=4;
-	int cols=3;
-	int i;
-
-	double leftMargin=1.0;
-	double topMargin=.5;
-
-	// 8.5" x 600 dots/in = 5100 dots
-	// 11" x 600 dots/in = 6600 dots
-	Size sz(5100-(1200*leftMargin),6600-(1200*topMargin));
-	Report report(sz);
-	int rowheight=(sz.cy - 4 * (rows - 1) - 20) /rows;
-
-	for(i=1;i<(rows*cols+1);i++)
-		data.Add("cell "+AsString(i));
-
-	qtf << "[ $$0,0#00000000000000000000000000000000:Default]";
-	qtf << "[{_}\r\n";
-	qtf << "[ {{500";
-	for(i=1;i<cols;i++)
-		qtf << ":500";
-	qtf << "H" << rowheight << "l/0r/0t/0b/0 ";
-
-	// Cell one doesn't start with ::
-	qtf << "[s0;= " << data[0] << "]\r\n";
-
-	for(i=1;i<data.GetCount();i++)
-	{
-		qtf << ":: [s0;= " << data[i] << "]\r\n";
-	}
-	qtf << "}}]\r\n";
-
-	report << qtf;
-	Perform(report);
+	Report r;
+	r << "[ $$0,0#00000000000000000000000000000000:Default]"
+	"[{_} "
+	"[ {{1755:848:856:846:834:869:795:3197@7|2 [s0;=%% [*2 Points]]"
+	"::|2 [s0;=%% [*2 CH]]"
+	":: [s0;=%% [*2 Dist]]"
+	":: [s0;=%% [*2 GS]]"
+	":: [s0;=%% [*2 ETE]]"
+	":: [s0;=%% [*2 ETA]]"
+	":: [s0;=%% [*2 Fuel U]]"
+	"::|2 [s0;=%% [*2 Notes]]"
+	"::@2 [s0; ]"
+	":: [s0; ]"
+	"::@7 [s0;=%% [*2 Rem]]"
+	":: [s0;=%% [*2 Act]]"
+	":: [s0;=%% [*2 ATE]]"
+	":: [s0;=%% [*2 ATA]]"
+	":: [s0;=%% [*2 Fuel R]]"
+	"::@2 [s0; ]"
+	":: [s0; ]"
+	":: [s0; ]"
+	"::@7 [s0;=%% [*2 `@TD]]"
+	":: [s0;=%% [*2 <`- Tot]]"
+	":: [s0;=%% [*2 Off `->]]"
+	"::@2 [s0;=*2%% ]"
+	"::@7 [s0;=%% [*2 `@FT]]"
+	"::@2 [s0; ]"
+	":: [s0;= `@SP]"
+	"::|1 [s0;= `@CH]"
+	":: [s0;=%% `@D]"
+	":: [s0;=%% `@GS]"
+	":: [s0;=%% `@E]"
+	":: [s0;=%% ]"
+	":: [s0;=%% `@FU]"
+	"::|1 [s0; `@N]"
+	"::|1 [s0;= `@P]"
+	":: [s0; ]"
+	":: [s0;=%% `@DR]"
+	":: [s0;=%% ]"
+	":: [s0;=%% ]"
+	":: [s0;=%% ]"
+	":: [s0;=%% `@FR]"
+	":: [s0; ]"
+	":: [s0; ]"
+	"::|1 [s0;= `@CH]"
+	":: [s0;=%% `@D]"
+	":: [s0;=%% `@GS]"
+	":: [s0;=%% `@E]"
+	":: [s0;=%% ]"
+	":: [s0;=%% `@FU]"
+	"::|1 [s0; `@N]"
+	"::|1 [s0;= `@P]"
+	":: [s0; ]"
+	":: [s0;=%% `@DR]"
+	":: [s0;=%% ]"
+	":: [s0;=%% ]"
+	":: [s0;=%% ]"
+	":: [s0;=%% `@FR]"
+	":: [s0; ]"
+	":: [s0; ]"
+	"::@7 [s0;= [*2 Totals]]"
+	"::@2 [s0;=%% `@DT]"
+	":: [s0;=%% `@GA]"
+	":: [s0;=%% `@ET]"
+	":: [s0;=%% `-]"
+	":: [s0;=%% `@FT]"
+	":: [s0; `-]}}]";
+		
+	Perform(r);
 }
diff --git a/uppdev/alloctest/alloctest.cpp b/uppdev/alloctest/alloctest.cpp
new file mode 100644
index 000000000..0e7de6897
--- /dev/null
+++ b/uppdev/alloctest/alloctest.cpp
@@ -0,0 +1,9 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	
+}
+
diff --git a/uppdev/alloctest/alloctest.upp b/uppdev/alloctest/alloctest.upp
new file mode 100644
index 000000000..f5b3b84eb
--- /dev/null
+++ b/uppdev/alloctest/alloctest.upp
@@ -0,0 +1,9 @@
+uses
+	Core;
+
+file
+	alloctest.cpp;
+
+mainconfig
+	"" = "";
+