From 572b30462b067c2f731c22f961ee0e89035326d6 Mon Sep 17 00:00:00 2001 From: cxl Date: Fri, 31 Oct 2008 08:40:42 +0000 Subject: [PATCH] uppdev sync git-svn-id: svn://ultimatepp.org/upp/trunk@575 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppdev/ArrayCtrlPaint/ArrayCtrlPaint.upp | 19 +- uppdev/ArrayCtrlPaint/init | 4 + uppdev/ColumnListDnD/ColumnListDnD.upp | 23 +- uppdev/ColumnListDnD/init | 4 + .../ColumnListDnD/srcdoc.tpp/Test$en-us.tpp | 4 + uppdev/CoreTopics/src.tpp/Any$en-us.tpp | 2 +- uppdev/CoreTopics/src.tpp/Any$en-us.tppi | 10 +- uppdev/Env/Env.upp | 9 + uppdev/Env/main.cpp | 21 + uppdev/Format2/Format2.cpp | 9 + uppdev/Format2/Format2.upp | 9 + uppdev/Gen3/Gen3.cpp | 84 ++ uppdev/Gen3/Gen3.upp | 10 + uppdev/Gen3/gen.h | 22 + uppdev/Gen3/init | 4 + uppdev/Parser/Parser.upp | 3 +- uppdev/Parser/init | 1 + uppdev/Parser/test.cpp | 32 +- uppdev/Parser/test2.cpp | 1 - uppdev/Parser2/Parser2.upp | 2 +- uppdev/RichEditTest/main.cpp | 5 + uppdev/TreeCtrl/main.cpp | 3 + uppdev/aaa/src.tpp/aaa$en-us.tpp | 13 + uppdev/aaa/src.tpp/aaa$en-us.tppi | 5 + uppdev/aaa/src.tpp/all.i | 6 +- uppdev/aaa/src.tpp/sdfg$en-us.tpp | 939 +++++++++++++++++- uppdev/aaa/src.tpp/sdfg$en-us.tppi | 17 + 27 files changed, 1222 insertions(+), 39 deletions(-) create mode 100644 uppdev/ArrayCtrlPaint/init create mode 100644 uppdev/ColumnListDnD/init create mode 100644 uppdev/ColumnListDnD/srcdoc.tpp/Test$en-us.tpp create mode 100644 uppdev/Env/Env.upp create mode 100644 uppdev/Env/main.cpp create mode 100644 uppdev/Format2/Format2.cpp create mode 100644 uppdev/Format2/Format2.upp create mode 100644 uppdev/Gen3/Gen3.cpp create mode 100644 uppdev/Gen3/Gen3.upp create mode 100644 uppdev/Gen3/gen.h create mode 100644 uppdev/Gen3/init create mode 100644 uppdev/aaa/src.tpp/aaa$en-us.tpp create mode 100644 uppdev/aaa/src.tpp/aaa$en-us.tppi create mode 100644 uppdev/aaa/src.tpp/sdfg$en-us.tppi diff --git a/uppdev/ArrayCtrlPaint/ArrayCtrlPaint.upp b/uppdev/ArrayCtrlPaint/ArrayCtrlPaint.upp index 6284f1903..167a831c6 100644 --- a/uppdev/ArrayCtrlPaint/ArrayCtrlPaint.upp +++ b/uppdev/ArrayCtrlPaint/ArrayCtrlPaint.upp @@ -1,9 +1,10 @@ -uses - CtrlLib; - -file - - "main.cpp"; - -mainconfig - "" = "GUI ST"; +uses + CtrlLib; + +file + new.cpp, + main.cpp; + +mainconfig + "" = "GUI ST"; + diff --git a/uppdev/ArrayCtrlPaint/init b/uppdev/ArrayCtrlPaint/init new file mode 100644 index 000000000..07e46befd --- /dev/null +++ b/uppdev/ArrayCtrlPaint/init @@ -0,0 +1,4 @@ +#ifndef _ArrayCtrlPaint_icpp_init_stub +#define _ArrayCtrlPaint_icpp_init_stub +#include "CtrlLib/init" +#endif diff --git a/uppdev/ColumnListDnD/ColumnListDnD.upp b/uppdev/ColumnListDnD/ColumnListDnD.upp index 4576fd34e..17f9fef44 100644 --- a/uppdev/ColumnListDnD/ColumnListDnD.upp +++ b/uppdev/ColumnListDnD/ColumnListDnD.upp @@ -1,10 +1,13 @@ -description "Drag&Drop with ColumnList"; - -uses - CtrlLib; - -file - main.cpp; - -mainconfig - "" = "GUI"; +description "Drag&Drop with ColumnList"; + +uses + CtrlLib; + +file + main.cpp, + src.tpp, + srcimp.tpp; + +mainconfig + "" = "GUI"; + diff --git a/uppdev/ColumnListDnD/init b/uppdev/ColumnListDnD/init new file mode 100644 index 000000000..1bb602e48 --- /dev/null +++ b/uppdev/ColumnListDnD/init @@ -0,0 +1,4 @@ +#ifndef _ColumnListDnD_icpp_init_stub +#define _ColumnListDnD_icpp_init_stub +#include "CtrlLib/init" +#endif diff --git a/uppdev/ColumnListDnD/srcdoc.tpp/Test$en-us.tpp b/uppdev/ColumnListDnD/srcdoc.tpp/Test$en-us.tpp new file mode 100644 index 000000000..aa8293931 --- /dev/null +++ b/uppdev/ColumnListDnD/srcdoc.tpp/Test$en-us.tpp @@ -0,0 +1,4 @@ +topic "TEST"; +[ $$0,0#00000000000000000000000000000000:Default] +[{_}%EN-US +[s0; TEST] \ No newline at end of file diff --git a/uppdev/CoreTopics/src.tpp/Any$en-us.tpp b/uppdev/CoreTopics/src.tpp/Any$en-us.tpp index aeda23c68..bbbcdb458 100644 --- a/uppdev/CoreTopics/src.tpp/Any$en-us.tpp +++ b/uppdev/CoreTopics/src.tpp/Any$en-us.tpp @@ -25,7 +25,7 @@ type.&] its content by picking.&] [s7; [%-*C@3 s]-|Source Any.&] [s0; &] -[s0;:`:`:Any`:`:Any`(`):%- [* Any]()&] +[s0;:Any`:`:Any`(`):%- [* Any]()&] [s2; Constructs an empty Any.&] [s0; &] [s0;:`:`:Any`:`:`~Any`(`):%- `~[* Any]()&] diff --git a/uppdev/CoreTopics/src.tpp/Any$en-us.tppi b/uppdev/CoreTopics/src.tpp/Any$en-us.tppi index 0f98160de..35b391e89 100644 --- a/uppdev/CoreTopics/src.tpp/Any$en-us.tppi +++ b/uppdev/CoreTopics/src.tpp/Any$en-us.tppi @@ -1,8 +1,8 @@ TITLE("Any") COMPRESSED -120,156,213,86,93,111,219,54,20,253,43,4,218,4,113,16,187,36,37,90,178,148,21,25,210,98,11,138,118,67,234,61,9,138,77,203,116,76,84,150,92,146,118,96,172,243,111,239,165,62,108,249,3,78,214,109,15,203,67,108,81,247,30,158,115,238,37,175,35,138,94,191,198,87,248,21,126,230,47,120,39,38,124,145,154,56,146,174,235,135,156,178,240,203,135,223,122,161,205,39,144,239,120,196,241,153,67,92,218,133,127,196,33,148,81,199,37,62,237,185,190,227,248,56,72,82,174,117,28,165,212,247,139,36,10,73,212,99,148,120,174,239,250,196,241,124,10,185,20,99,138,61,202,136,235,248,148,5,99,161,147,56,194,16,238,64,120,175,235,244,48,193,216,35,4,59,212,195,14,115,9,113,40,64,80,143,18,204,2,145,141,227,232,215,110,104,19,92,43,138,117,129,122,23,208,92,23,3,186,77,115,29,226,96,234,48,210,99,221,96,36,30,101,118,76,18,123,86,146,135,3,105,196,172,82,196,137,23,94,222,176,144,64,110,247,170,251,202,131,125,93,6,187,245,172,36, -7,242,40,237,178,30,97,46,112,114,49,13,148,248,186,144,74,204,68,102,42,8,73,8,37,225,8,128,128,195,122,189,238,16,23,151,86,121,64,134,96,32,78,9,172,129,16,143,176,30,238,49,159,248,216,241,92,202,60,208,62,231,138,3,155,63,7,127,157,189,255,212,254,227,51,138,52,14,209,207,217,234,60,46,190,217,15,22,126,56,107,163,232,230,2,119,112,135,50,214,66,85,85,110,46,186,110,11,13,98,8,175,191,7,131,184,25,56,87,114,201,141,216,134,70,15,195,96,24,124,204,151,130,143,82,241,80,46,215,143,117,216,117,3,241,237,32,182,28,104,73,165,228,134,164,70,28,233,185,72,36,79,145,89,205,5,202,39,40,201,51,195,101,38,20,74,248,220,194,53,22,101,246,136,178,60,131,37,133,52,60,192,75,145,22,54,218,160,232,13,226,217,42,46,144,58,232,206,32,158,234,28,184,231,75,9,173,132,102,194,76,243,177,70,19,72,254,186,16,106,101,209,204,84,148,59,107,147,43,49,6,128,49,82,194,40,41,150,245,107,187,119,181,67,193,117, -34,147,114,139,134,146,41,215,104,46,147,47,72,139,25,207,140,76,116,253,246,163,152,141,132,210,141,58,224,48,176,230,65,90,253,113,97,83,135,131,250,241,124,216,10,108,165,46,45,116,92,189,28,84,143,195,115,248,118,227,32,29,183,42,67,127,183,251,2,73,109,212,34,1,21,29,212,87,60,211,19,216,117,135,123,190,80,137,40,216,62,77,37,56,7,158,24,149,23,46,72,179,13,29,173,10,37,176,92,72,240,66,20,157,181,47,111,139,45,219,223,62,111,80,58,167,37,237,106,168,185,222,214,52,161,242,25,18,179,185,89,157,198,26,174,27,104,195,245,62,222,59,177,81,125,208,233,112,62,231,41,116,237,224,250,68,207,71,15,253,170,123,251,241,166,85,143,46,131,241,241,173,18,0,88,45,92,180,234,150,46,151,119,220,46,122,170,143,100,166,161,247,54,18,173,153,96,165,11,168,237,111,253,70,195,67,214,54,224,13,186,23,102,161,50,180,228,233,66,64,228,189,128,98,138,12,124,55,121,209,146,153,120,74,87,40,41,182,29,239,0,252,128,3,5,157, -166,246,70,236,40,207,211,109,232,157,222,72,223,13,43,186,175,118,163,15,53,209,208,99,112,220,224,16,219,126,171,78,239,17,131,14,93,185,47,175,198,241,246,136,29,247,4,202,46,144,156,88,59,148,176,55,73,141,253,36,205,116,107,255,126,119,253,103,173,241,139,48,7,125,81,82,214,112,161,52,234,87,87,11,221,233,235,254,91,52,91,104,56,115,240,6,244,92,161,220,202,121,146,26,158,167,160,41,159,11,197,141,204,51,43,80,166,169,120,228,233,143,91,118,127,140,198,191,235,205,65,79,156,202,216,183,237,68,79,213,78,22,139,112,193,254,191,44,109,202,90,230,114,188,117,229,54,21,92,29,233,155,25,140,82,141,46,236,52,170,174,105,221,122,25,254,254,137,125,111,239,216,103,45,126,225,25,203,94,40,114,159,132,29,81,98,252,15,89,84,191,24,230,5,214,223,49,185,44,121,174,134,63,213,12,170,145,90,253,140,1,224,170,53,237,108,105,52,103,84,12,189,106,97,83,157,98,222,214,152,199,134,237,193,120,45,71,239,203,198,105,252,29,80,196,124, -232, +120,156,213,86,93,111,219,54,20,253,43,4,218,4,118,16,187,36,37,90,178,148,21,25,210,98,11,138,118,67,234,61,9,138,77,203,116,76,84,150,92,146,118,96,172,243,111,239,165,62,108,249,3,73,214,109,15,203,67,108,81,247,30,158,115,238,37,175,35,138,94,191,198,151,248,21,126,230,47,120,39,166,124,153,154,56,146,174,235,135,156,178,240,203,135,223,250,161,205,39,144,239,120,196,241,153,67,92,218,131,127,196,33,148,81,199,37,62,237,187,190,227,248,56,72,82,174,117,28,165,212,247,139,36,10,73,212,99,148,120,174,239,250,196,241,124,10,185,20,99,138,61,202,136,235,248,148,5,19,161,147,56,194,16,238,64,120,191,231,244,49,193,216,35,4,59,212,195,14,115,9,113,40,64,80,143,18,204,2,145,77,226,232,215,94,104,19,92,43,138,245,128,122,15,208,92,23,3,186,77,115,29,226,96,234,48,210,103,189,96,44,30,100,118,74,18,123,86,146,135,3,105,196,188,82,196,137,23,94,92,179,144,64,110,239,178,247,202,131,125,93,6,187,245,173,36, +7,242,40,237,177,62,97,46,112,114,49,13,148,248,186,148,74,204,69,102,42,8,73,8,37,225,24,128,128,195,102,179,233,18,23,151,86,121,64,134,96,32,78,9,172,129,16,143,176,62,238,51,159,248,216,241,92,202,60,208,190,224,138,3,155,63,135,127,157,189,255,212,249,227,51,138,52,14,209,207,217,250,60,46,190,217,15,22,126,56,235,160,232,186,133,187,184,75,25,107,163,170,42,215,173,158,219,70,195,24,194,235,239,193,48,110,6,46,148,92,113,35,118,161,209,253,40,24,5,31,243,149,224,227,84,220,151,203,245,99,29,118,213,64,124,59,140,45,7,90,82,41,185,33,169,17,71,122,33,18,201,83,100,214,11,129,242,41,74,242,204,112,153,9,133,18,190,176,112,141,69,153,61,160,44,207,96,73,33,13,15,240,82,164,133,141,54,40,122,131,120,182,142,11,164,46,186,53,136,167,58,7,238,249,74,66,43,161,185,48,179,124,162,209,20,146,191,46,133,90,91,52,51,19,229,206,218,228,74,76,0,96,130,148,48,74,138,85,253,218,238,93,237,80,112,157, +202,164,220,162,161,100,198,53,90,200,228,11,210,98,206,51,35,19,93,191,253,40,230,99,161,116,163,14,56,12,172,121,144,86,127,180,108,234,104,88,63,158,143,218,129,173,212,133,133,142,171,151,195,234,113,116,14,223,174,29,164,227,118,101,232,239,118,95,32,169,141,90,38,160,162,139,6,138,103,122,10,187,238,113,207,151,42,17,5,219,199,153,4,231,192,19,163,242,194,5,105,118,161,227,117,161,4,150,11,9,94,136,162,179,206,197,77,177,101,231,219,231,45,74,119,95,82,83,206,62,255,154,231,77,77,17,170,158,33,49,95,152,245,9,156,134,53,163,77,3,109,180,57,196,123,39,182,138,143,186,28,206,230,34,133,142,29,94,61,209,239,209,253,160,234,220,65,188,109,211,147,203,96,122,124,163,4,0,86,11,173,118,221,206,229,242,158,211,69,63,13,144,204,52,244,221,86,162,53,18,108,116,1,181,243,109,208,104,118,200,218,5,188,65,119,194,44,85,134,86,60,93,10,136,188,19,80,72,145,129,231,38,47,218,49,19,143,233,26,37,197,182,147,61,128,31, +112,160,160,211,212,222,136,29,231,121,186,11,189,213,91,233,251,97,69,231,213,110,12,160,38,26,250,11,142,26,28,96,219,107,213,201,61,97,208,177,43,119,229,181,56,217,29,175,211,158,64,217,5,146,83,107,135,18,246,22,169,177,31,165,153,237,236,63,236,174,255,172,53,126,17,230,168,47,74,202,26,46,147,70,253,234,106,161,91,125,53,120,139,230,75,13,231,13,222,128,158,75,148,91,57,143,82,195,243,12,52,229,11,161,184,145,121,102,5,202,52,21,15,60,253,113,203,238,78,209,248,119,189,57,234,137,167,50,14,109,123,162,167,106,39,139,69,184,92,255,95,150,54,101,173,114,57,217,185,114,147,10,174,78,244,205,28,198,168,70,45,59,137,170,43,90,183,95,134,127,120,98,223,219,59,246,89,139,95,120,198,178,23,138,60,36,97,199,147,152,252,67,22,213,175,133,69,129,245,119,76,46,75,158,171,209,79,53,131,106,156,86,63,97,0,184,106,77,59,91,26,205,25,21,3,175,90,216,86,167,152,181,53,230,169,65,123,52,90,203,177,251,178,81,26,127, +7,157,254,123,180, diff --git a/uppdev/Env/Env.upp b/uppdev/Env/Env.upp new file mode 100644 index 000000000..5872304d3 --- /dev/null +++ b/uppdev/Env/Env.upp @@ -0,0 +1,9 @@ +uses + CtrlLib; + +file + main.cpp; + +mainconfig + "" = "GUI"; + diff --git a/uppdev/Env/main.cpp b/uppdev/Env/main.cpp new file mode 100644 index 000000000..864902679 --- /dev/null +++ b/uppdev/Env/main.cpp @@ -0,0 +1,21 @@ +#include + +using namespace Upp; + +class A +{ + public: + A() { DUMP(Environment().Get("PATH")); } +}; + +A a; // <<= STATIC OBJECT CAUSES CRASH + +struct B : TopWindow +{ + +}; + +GUI_APP_MAIN +{ + B().Run(); +} diff --git a/uppdev/Format2/Format2.cpp b/uppdev/Format2/Format2.cpp new file mode 100644 index 000000000..c64c40805 --- /dev/null +++ b/uppdev/Format2/Format2.cpp @@ -0,0 +1,9 @@ +#include + +using namespace Upp; + +CONSOLE_APP_MAIN +{ + DDUMP(Format("|%*=s|\n", 20, "test")); +} + diff --git a/uppdev/Format2/Format2.upp b/uppdev/Format2/Format2.upp new file mode 100644 index 000000000..a09676d7f --- /dev/null +++ b/uppdev/Format2/Format2.upp @@ -0,0 +1,9 @@ +uses + Core; + +file + Format2.cpp; + +mainconfig + "" = ""; + diff --git a/uppdev/Gen3/Gen3.cpp b/uppdev/Gen3/Gen3.cpp new file mode 100644 index 000000000..3aa26f37b --- /dev/null +++ b/uppdev/Gen3/Gen3.cpp @@ -0,0 +1,84 @@ +#include "gen.h" + +void Circuit::Evaluate(byte *value) const +{ + byte newvalue[COUNT]; + for(int i = 0; i < COUNT; i++) { + const Nand& n = nand[i]; + newvalue[i] = ~(value[n.i1] & value[n.i2]); + } + memcpy(value, newvalue, COUNT); +} + +void Circuit::SetRandom() +{ + for(int i = 0; i < COUNT; i++) { + Nand& n = nand[i]; + n.i1 = (word)Random() % COUNT; + n.i2 = (word)Random() % COUNT; + } +} + +void Breed(Circuit& d, const Circuit& a, const Circuit& b) +{ + for(int i = 0; i < COUNT; i++) + d.nand[i] = Random() & 1 ? a.nand[i] : b.nand[i]; +} + +int Compute(const Circuit& c, byte *out, int outcount, const byte *in, int incount, int limit = 100) +{ + byte value[COUNT]; + memset(value, 0, COUNT); + int w = 0; + for(int i = 0; i < incount; i++) + for(int q = 0x80; q; q >>= 1) + value[w++] = !!(q & in[i]); + + memset(out, 0, outcount); + for(int ii = 0; ii < limit; ii++) { + c.Evaluate(value); + Buffer nout(outcount, 0); + int r = w; + for(int i = 0; i < outcount; i++) { + nout[i] = 0; + for(int q = 0x80; q; q >>= 1) + if(value[r++]) + nout[i] |= q; + } + if(memcmp(out, ~nout, outcount) == 0) + return ii; + memcpy(out, ~nout, outcount); + } + return limit; +} + +int Test(Circuit& c, bool print) +{ + int bad = 0; + for(int x = 0; x < 8; x++) { + for(int y = 0; y < 8; y++) { + byte in[2]; + in[0] = x; + in[1] = y; + byte out; + Compute(c, &out, 1, in, 2); + if(print) + LOG((int)x << '+' << (int)y << '=' << (int)out); + bad += x + y != out; + } + } + return bad; +} + +CONSOLE_APP_MAIN +{ + Circuit h; + for(;;) { + h.SetRandom(); + int b = Test(h, false); + DDUMP(b); + if(b != 63) + break; + } + Test(h, true); +} diff --git a/uppdev/Gen3/Gen3.upp b/uppdev/Gen3/Gen3.upp new file mode 100644 index 000000000..5514d774d --- /dev/null +++ b/uppdev/Gen3/Gen3.upp @@ -0,0 +1,10 @@ +uses + Core; + +file + gen.h, + Gen3.cpp; + +mainconfig + "" = ""; + diff --git a/uppdev/Gen3/gen.h b/uppdev/Gen3/gen.h new file mode 100644 index 000000000..5e52de5d9 --- /dev/null +++ b/uppdev/Gen3/gen.h @@ -0,0 +1,22 @@ +#ifndef _Gen3_gen_h_ +#define _Gen3_gen_h_ + +#include + +using namespace Upp; + +#define COUNT 256 + +struct Circuit { + struct Nand { + word i1, i2; + }; + + Nand nand[COUNT]; + + void Evaluate(byte *value) const; + void SetRandom(); +}; + + +#endif diff --git a/uppdev/Gen3/init b/uppdev/Gen3/init new file mode 100644 index 000000000..b859f104e --- /dev/null +++ b/uppdev/Gen3/init @@ -0,0 +1,4 @@ +#ifndef _Gen3_icpp_init_stub +#define _Gen3_icpp_init_stub +#include "Core/init" +#endif diff --git a/uppdev/Parser/Parser.upp b/uppdev/Parser/Parser.upp index b7703b4e9..e732fcf3f 100644 --- a/uppdev/Parser/Parser.upp +++ b/uppdev/Parser/Parser.upp @@ -1,7 +1,8 @@ uses Core, CtrlLib, - CodeEditor; + CodeEditor, + Sql; file test.cpp, diff --git a/uppdev/Parser/init b/uppdev/Parser/init index f5ffaff84..a9b6c7ec2 100644 --- a/uppdev/Parser/init +++ b/uppdev/Parser/init @@ -3,4 +3,5 @@ #include "Core/init" #include "CtrlLib/init" #include "CodeEditor/init" +#include "Sql/init" #endif diff --git a/uppdev/Parser/test.cpp b/uppdev/Parser/test.cpp index 01012bd05..39212a051 100644 --- a/uppdev/Parser/test.cpp +++ b/uppdev/Parser/test.cpp @@ -119,7 +119,7 @@ struct FindBrokenRefIterator : RichTxt::Iterator { { this-> ; - THISBACK( ; + THISBACK(; if(pos >= cursor) { if(para.format.label != "noref") { if(IsNull(para.format.label)) @@ -152,7 +152,7 @@ void Foo() String(xxx). ; String x; x.; - x->; + x->; // << AttrText("Hello!"). ; Vector vx; vx. ; @@ -169,10 +169,29 @@ void Foo() es.NullText(). ; String x[5]; - x[1]. ; + x[1]. ; // << here! + String y; + y[0]. ; // << here! Rect r; - r. - + r. ; + Vector:: ; + Array ax; + ax.At(1). ; + Array tst; + tst[1]. ; + Ctrl::Dsize; + Ctrl::LogPos::x; +} + +int TabCtrl::GetTab(Point p) const +{ + if(p.y >= 0 && p.y < style->tabheight) + for(int i = 0; i < tab.GetCount(); i++) + if(p.x < tab[i].Right()) // << Here! + return i; + tab[i]. ; // << + return -1; + TabCtrl:: } struct FwTest; @@ -186,7 +205,8 @@ struct Dlg : WithEditStringLayout { this-> ; text. ; } - Vector:: + Pusher::GetRect(). ; + }; struct FwTest { diff --git a/uppdev/Parser/test2.cpp b/uppdev/Parser/test2.cpp index b30450526..970a12e51 100644 --- a/uppdev/Parser/test2.cpp +++ b/uppdev/Parser/test2.cpp @@ -1,4 +1,3 @@ void ItemList::Clear(String x) { } - diff --git a/uppdev/Parser2/Parser2.upp b/uppdev/Parser2/Parser2.upp index c05cefc38..a33bfab34 100644 --- a/uppdev/Parser2/Parser2.upp +++ b/uppdev/Parser2/Parser2.upp @@ -1,5 +1,5 @@ file - hh.cpp, + new.cpp, test.cpp; mainconfig diff --git a/uppdev/RichEditTest/main.cpp b/uppdev/RichEditTest/main.cpp index 29c68bb3f..d18a58e3c 100644 --- a/uppdev/RichEditTest/main.cpp +++ b/uppdev/RichEditTest/main.cpp @@ -23,6 +23,9 @@ GUI_APP_MAIN DUMP(ScrollBarSize()); e.Pick(ParseQTF(LoadFile(FileName()))); + RichEdit::PosInfo f; + LoadFromFile(f, ConfigFile("pos")); + e.SetPosInfo(f); // e.Pick(ParseQTF(AsQTF(CreateImageObject(CtrlImg::exclamation)) + " hahahaha")); TopWindow w; w.SetRect(0, 0, 700, 500); @@ -36,5 +39,7 @@ GUI_APP_MAIN */ String x = e.GetQTF(); SaveFile(FileName(), x); + f = e.GetPosInfo(); + StoreToFile(f, ConfigFile("pos")); LOG("Exit"); } diff --git a/uppdev/TreeCtrl/main.cpp b/uppdev/TreeCtrl/main.cpp index dd7fd01c0..71257852f 100644 --- a/uppdev/TreeCtrl/main.cpp +++ b/uppdev/TreeCtrl/main.cpp @@ -34,6 +34,7 @@ struct App : TopWindow { Vector parent, parent2; parent.Add(0); tree.SetRoot(Image(), "The Tree"); + Array