From 5c5c0f76e9ed9b36193345337e5e4c6e6a03413c Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 13 Oct 2011 18:45:21 +0000 Subject: [PATCH] *CtrlCore: Fixed semantics of PasteClip Accept (problem with D&D in LineEdit) git-svn-id: svn://ultimatepp.org/upp/trunk@4004 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlCore/CtrlClip.cpp | 13 ++++++++++--- uppsrc/CtrlCore/CtrlCore.h | 3 ++- uppsrc/CtrlCore/init | 2 +- uppsrc/CtrlCore/src.tpp/PasteClip$en-us.tpp | 14 ++++++++------ uppsrc/CtrlCore/src.tpp/PasteClip$en-us.tppi | 18 +++++++++--------- uppsrc/CtrlLib/init | 2 +- 6 files changed, 31 insertions(+), 21 deletions(-) diff --git a/uppsrc/CtrlCore/CtrlClip.cpp b/uppsrc/CtrlCore/CtrlClip.cpp index 713b457cd..e538d6d53 100644 --- a/uppsrc/CtrlCore/CtrlClip.cpp +++ b/uppsrc/CtrlCore/CtrlClip.cpp @@ -60,12 +60,19 @@ bool PasteClip::Accept() bool PasteClip::Accept(const char *_fmt) { Vector f = Split(_fmt, ';'); - for(int i = 0; i < f.GetCount(); i++) + for(int i = 0; i < f.GetCount(); i++) { + if(IsAccepted() && fmt == f[i]) + return paste; if(IsAvailable(f[i])) { accepted = true; - fmt = f[i]; - return paste; + if(paste) { + fmt = f[i]; + data = Get(f[i]); + return true; + } + break; } + } return false; } diff --git a/uppsrc/CtrlCore/CtrlCore.h b/uppsrc/CtrlCore/CtrlCore.h index 6e8e3b0c3..e07671cdf 100644 --- a/uppsrc/CtrlCore/CtrlCore.h +++ b/uppsrc/CtrlCore/CtrlCore.h @@ -220,6 +220,7 @@ class PasteClip { bool paste; bool accepted; String fmt; + String data; void GuiPlatformConstruct(); @@ -231,7 +232,7 @@ public: bool Accept(const char *fmt); String GetFormat() { return fmt; } - String Get() const { return Get(fmt); } + String Get() const { return data; } operator String() const { return Get(); } String operator ~() const { return Get(); } diff --git a/uppsrc/CtrlCore/init b/uppsrc/CtrlCore/init index 0a788a392..f46c883cd 100644 --- a/uppsrc/CtrlCore/init +++ b/uppsrc/CtrlCore/init @@ -3,7 +3,7 @@ #include "Draw/init" #include "plugin\bmp/init" #include "RichText/init" -#define BLITZ_INDEX__ F89E4CB092FA19B5E411E919DE4E95090 +#define BLITZ_INDEX__ F4E405F867CAEC7A41FB56C43A3C2C139 #include "CtrlCore.icpp" #undef BLITZ_INDEX__ #endif diff --git a/uppsrc/CtrlCore/src.tpp/PasteClip$en-us.tpp b/uppsrc/CtrlCore/src.tpp/PasteClip$en-us.tpp index 7ea994e83..a47d83d28 100644 --- a/uppsrc/CtrlCore/src.tpp/PasteClip$en-us.tpp +++ b/uppsrc/CtrlCore/src.tpp/PasteClip$en-us.tpp @@ -93,18 +93,20 @@ har]_`*[*@3 fmt])&] separated by semicolon. If any of them is available in the PasteClip, it is set to accepted status and accepted format is stored in PasteClip (to be retrieved by GetFormat method later). If PasteClip -is in paste mode, method returns true. Note that Accept can return -false even if format is accepted `- this happens in `'drag`' -stage of drag`&drop operation to indicate that target is willing -to accept the data.&] +is in paste mode, method stores source data rendered in accepted +format and returns true. Note that Accept can return false even +if format is accepted `- this happens in `'drag`' stage of drag`&drop +operation to indicate that target is willing to accept the data.&] [s3;%% &] [s4; &] [s5;:PasteClip`:`:GetFormat`(`): [_^String^ String]_[* GetFormat]()&] -[s2;%% Returns a format accepted by the last Accept(fmt) method.&] +[s2;%% Returns a format accepted by the last Accept(fmt) method returning +true.&] [s3; &] [s4; &] [s5;:PasteClip`:`:Get`(`)const: [_^String^ String]_[* Get]()_[@(0.0.255) const]&] -[s2;%% Same as Get(GetFormat()).&] +[s2;%% Returns data rendered by the last Accept(fmt) method returning +true.&] [s3; &] [s4; &] [s5;:PasteClip`:`:operator String`(`)const: [* operator_String]()_[@(0.0.255) const]&] diff --git a/uppsrc/CtrlCore/src.tpp/PasteClip$en-us.tppi b/uppsrc/CtrlCore/src.tpp/PasteClip$en-us.tppi index 745e8b9ef..45e14878e 100644 --- a/uppsrc/CtrlCore/src.tpp/PasteClip$en-us.tppi +++ b/uppsrc/CtrlCore/src.tpp/PasteClip$en-us.tppi @@ -1,12 +1,12 @@ TITLE("struct ClipData : public Moveable ") COMPRESSED -120,156,181,89,11,111,219,70,18,254,43,139,186,177,37,67,101,249,212,243,112,112,144,52,57,227,46,77,26,247,138,59,8,140,184,162,86,210,54,20,201,114,151,114,140,32,254,237,55,179,187,124,232,97,91,62,180,129,97,201,203,217,217,249,102,190,121,44,51,117,201,247,223,219,61,251,204,126,226,223,248,53,91,210,50,145,225,148,251,254,112,66,221,96,242,249,159,239,71,19,220,239,192,126,111,224,120,195,192,115,124,183,15,191,28,207,113,3,215,243,157,161,59,242,135,158,55,180,199,113,66,133,8,167,137,59,28,170,77,110,207,61,115,7,129,235,12,252,161,63,116,188,193,208,133,189,174,109,187,246,192,13,28,223,27,186,193,120,193,68,28,78,109,16,247,224,140,81,223,27,217,142,109,15,28,199,246,220,129,237,5,190,227,120,46,168,112,7,174,99,7,99,150,46,194,233,63,250,19,220,224,35,168,160,15,166,247,65,155,239,219,160,29,183,249,158,227,217,174,23,56,163,160,63,158,179,21,79,143,65,10,158,132,52,176,199,92,178,141,65,68,253,201,229,85,48, -113,96,107,191,215,63,27,192,177,126,0,135,141,16,145,7,219,92,183,31,140,156,192,7,147,124,219,29,23,236,143,146,23,108,195,82,105,52,112,199,113,157,201,220,25,76,192,132,251,251,123,203,241,109,237,169,1,216,226,216,96,183,235,192,26,224,24,56,193,200,30,5,67,103,104,123,3,223,13,6,0,61,167,5,221,24,36,115,223,157,24,28,195,222,240,172,239,244,193,163,246,16,236,15,70,160,192,6,16,240,9,142,12,224,199,27,142,165,217,140,251,112,211,168,55,58,3,39,121,129,61,24,217,3,127,16,248,128,196,117,250,14,56,210,70,252,16,134,113,154,21,27,154,132,211,175,179,111,100,74,190,126,117,144,37,87,29,8,136,229,187,150,221,37,83,97,79,200,244,242,106,48,241,201,171,132,231,175,169,164,97,248,237,219,121,56,21,222,132,224,135,51,25,87,79,162,113,52,22,178,40,99,57,38,211,171,142,109,217,22,152,219,245,136,94,12,167,30,153,133,211,75,175,81,133,43,99,88,107,11,231,229,60,225,113,37,124,229,77,60,242,46,219,50,58,79, -24,46,254,237,64,195,223,103,33,26,98,107,123,236,201,139,23,228,215,53,23,230,212,178,96,164,96,121,193,4,196,9,22,121,186,74,24,89,192,94,121,151,51,2,132,230,171,148,45,136,204,72,12,74,73,150,179,130,74,158,165,164,131,127,207,51,90,44,72,86,144,69,65,87,209,249,162,200,242,174,5,250,25,89,242,148,38,74,17,145,5,77,197,146,21,160,102,203,169,214,179,166,130,208,228,150,222,9,84,61,103,100,14,242,197,29,90,5,38,244,200,188,148,112,56,41,69,73,147,228,142,208,60,7,212,250,224,188,200,182,28,210,134,108,32,89,121,14,230,46,49,80,96,125,135,89,43,139,112,73,98,90,139,17,43,71,125,214,239,249,138,208,116,65,172,21,95,170,13,228,122,67,87,172,171,22,227,44,221,178,66,160,246,108,73,68,86,22,49,67,187,52,8,173,94,41,5,67,217,151,156,165,130,111,89,175,118,51,32,73,178,91,133,68,200,12,60,42,193,1,70,139,242,0,7,189,5,95,181,181,209,56,206,54,57,77,57,120,229,150,203,53,137,46,10,72, -110,134,240,163,11,178,44,211,88,161,45,133,241,190,50,81,34,186,61,195,172,38,188,21,73,223,116,28,119,216,125,171,126,95,57,196,132,125,122,73,62,40,246,144,119,108,51,7,188,123,92,13,118,185,138,150,3,83,103,159,126,163,73,201,62,17,245,17,206,64,11,62,81,164,114,81,237,77,3,212,210,218,96,17,191,248,71,213,106,148,74,241,141,10,246,39,162,63,195,89,39,186,4,237,90,32,236,118,90,188,71,248,66,134,51,101,67,123,61,58,15,103,120,114,183,54,231,77,229,185,150,211,76,44,42,211,21,229,218,124,179,90,94,56,110,245,71,101,84,212,137,186,202,146,163,230,131,122,45,22,118,186,179,67,227,107,11,127,130,194,184,165,9,36,28,26,2,160,53,226,110,71,1,105,217,242,100,56,95,161,98,76,99,204,64,38,41,79,170,144,30,71,81,127,239,40,147,116,72,163,243,168,167,33,0,188,203,168,187,255,176,27,117,199,234,176,170,168,28,11,204,62,77,246,99,132,165,74,59,191,247,96,228,65,226,217,177,111,244,118,27,10,188,84,85,75, -144,233,139,31,234,199,42,207,205,130,57,5,189,15,133,47,103,192,151,45,35,27,149,20,100,75,11,142,213,84,156,66,230,125,135,26,63,158,159,232,178,61,55,60,2,238,81,108,22,0,49,220,38,33,226,4,117,80,105,19,18,125,167,249,173,43,147,50,237,59,210,73,179,86,193,235,146,186,236,52,69,71,235,211,15,172,240,89,126,56,64,126,104,250,95,97,157,105,182,237,78,121,88,22,79,237,221,118,221,187,63,80,33,25,62,70,144,106,190,219,235,221,102,230,171,90,119,45,223,100,187,106,182,74,172,221,104,85,172,76,89,194,136,53,125,85,64,235,45,5,182,140,131,6,171,36,177,199,54,226,208,244,112,145,38,34,195,45,255,113,28,34,88,194,180,163,26,169,118,85,209,213,227,217,221,130,252,139,3,107,119,61,20,236,121,232,90,188,220,66,17,194,244,169,50,34,94,211,2,171,74,85,54,91,20,159,103,89,162,170,102,107,219,241,76,105,47,129,190,112,102,202,197,114,35,195,71,75,237,71,6,19,142,162,92,201,200,237,154,165,59,142,207,150,48,149, -136,186,69,155,206,108,50,11,117,63,84,2,118,64,191,101,242,33,176,71,123,4,200,255,69,40,77,79,83,120,116,122,192,236,0,192,158,139,232,101,28,179,92,154,92,62,22,48,45,208,206,237,27,6,164,86,99,143,166,47,140,81,13,165,33,97,169,218,1,230,116,36,45,86,76,154,5,237,124,61,132,21,7,177,50,162,98,157,149,9,20,239,31,73,142,86,146,240,112,188,130,19,140,112,244,3,89,148,170,94,52,35,105,99,74,15,231,167,234,160,37,100,13,171,164,163,11,37,127,65,114,24,77,213,240,71,19,9,172,135,201,147,193,221,33,85,116,33,155,12,230,49,18,151,133,128,148,236,240,218,54,248,184,5,21,48,253,229,160,2,203,156,97,27,158,14,249,159,102,146,228,25,212,63,160,184,70,27,93,32,78,16,150,152,184,11,28,110,217,94,110,31,159,74,142,70,106,151,126,79,68,237,217,220,171,163,252,1,111,81,12,221,210,162,20,234,128,209,3,28,74,73,2,53,2,253,100,82,9,230,239,84,242,37,199,44,19,12,239,96,72,129,57,140,93,108, -195,227,44,1,140,228,122,9,254,184,195,77,16,214,13,58,139,86,197,0,185,139,177,174,33,171,240,225,221,133,201,29,82,25,210,169,74,88,173,85,38,8,61,147,171,68,168,21,1,13,213,173,3,168,80,112,182,213,70,65,98,190,209,155,0,227,58,91,144,4,204,45,186,202,196,102,39,87,181,89,51,113,147,45,224,26,96,164,219,252,181,200,207,153,196,123,0,40,211,110,87,215,7,45,98,136,7,199,166,132,47,91,134,214,182,3,137,37,182,141,53,178,47,85,7,214,252,4,172,43,197,197,99,252,222,97,147,58,221,164,5,40,187,229,73,98,186,173,62,72,249,246,177,177,125,191,204,105,239,152,186,240,80,109,211,66,237,218,80,149,39,218,186,251,104,156,224,116,180,1,154,99,229,166,14,48,170,107,60,122,2,255,85,237,61,165,222,62,90,63,111,128,212,120,219,4,201,78,141,160,211,237,158,96,128,246,60,20,131,122,130,174,141,185,36,213,195,153,177,230,116,43,158,115,116,116,255,132,11,90,71,86,123,32,191,239,255,92,107,62,178,223,97,234,56,236, -25,219,140,47,204,213,8,5,14,122,70,147,88,106,26,71,153,58,161,45,51,60,233,139,119,12,183,108,120,68,151,88,127,160,2,72,36,51,63,90,8,148,42,117,243,83,20,103,49,199,97,210,34,255,54,175,19,84,114,113,161,47,215,186,80,27,25,245,98,66,117,147,207,76,247,21,188,168,151,169,214,132,149,14,175,109,144,125,52,150,101,253,130,67,213,18,85,18,84,238,170,178,165,222,24,136,170,67,9,195,111,44,76,188,16,178,135,250,82,3,134,125,161,27,104,221,210,188,127,80,59,204,81,189,234,117,134,42,86,218,59,167,229,197,75,53,3,182,169,209,138,10,32,171,114,67,203,61,193,205,183,85,123,207,161,220,100,232,53,26,215,230,30,171,67,157,44,85,69,234,245,207,175,163,217,171,247,31,254,219,211,95,223,189,255,237,167,83,232,132,134,225,75,21,182,208,246,137,19,128,236,200,63,1,168,30,12,215,248,234,73,110,168,248,172,162,170,117,180,231,235,7,17,254,191,208,110,154,216,128,245,15,230,203,77,19,154,35,128,161,247,126,105,53,230,87, -107,154,174,152,32,135,221,192,52,234,47,161,73,166,29,214,215,209,108,182,168,97,133,136,146,75,213,129,161,98,3,177,11,201,227,50,161,133,214,175,91,202,73,77,3,38,123,67,251,7,226,215,190,3,24,201,83,35,135,99,34,180,207,234,190,212,180,207,19,98,112,45,126,41,89,113,247,180,81,74,236,153,22,53,37,173,125,225,195,251,155,158,45,241,138,139,197,66,189,232,52,211,193,206,76,122,10,139,174,133,250,243,105,4,74,236,207,65,144,229,63,234,185,199,224,216,179,29,119,159,98,122,243,71,245,182,160,185,54,183,218,131,249,239,24,109,171,126,201,117,112,139,13,255,7,121,222,65,51, +120,156,181,89,9,111,219,56,22,254,43,196,100,154,216,129,71,163,211,242,177,88,164,104,167,221,96,183,211,110,179,59,216,133,161,218,180,76,219,156,202,146,70,164,156,6,69,243,219,247,61,146,58,124,36,113,22,157,34,136,29,234,241,241,251,222,77,117,226,146,31,127,180,123,246,153,253,196,191,209,107,182,164,101,34,163,9,247,253,193,152,186,193,248,243,223,223,15,199,184,223,129,253,94,232,120,131,192,115,124,183,15,191,28,207,113,3,215,243,157,129,59,244,7,158,55,176,71,113,66,133,136,38,137,59,24,168,77,110,207,61,115,195,192,117,66,127,224,15,28,47,28,184,176,215,181,109,215,14,221,192,241,189,129,27,140,22,76,196,209,196,6,113,15,206,24,246,189,161,237,216,118,232,56,182,231,134,182,23,248,142,227,185,160,194,13,93,199,14,70,44,93,68,147,191,245,199,184,193,71,82,65,31,160,247,65,155,239,219,160,29,183,249,158,227,217,174,23,56,195,160,63,154,179,21,79,143,81,10,158,164,20,218,35,46,217,198,48,162,254,248,242,42,24,59,176, +181,223,235,159,133,112,172,31,192,97,67,100,228,193,54,215,237,7,67,39,240,1,146,111,187,163,130,253,81,242,130,109,88,42,141,6,238,56,174,51,158,59,225,24,32,220,223,223,91,142,111,107,75,133,128,197,177,1,183,235,192,26,240,8,157,96,104,15,131,129,51,176,189,208,119,131,16,168,231,180,160,27,195,100,238,187,99,195,99,208,27,156,245,157,62,88,212,30,0,254,96,8,10,108,32,1,159,96,200,0,126,188,193,72,154,205,184,15,55,13,123,195,51,48,146,23,216,225,208,14,253,48,240,129,137,235,244,29,48,164,141,252,193,13,163,52,43,54,52,137,38,95,167,223,200,132,124,253,234,96,148,92,117,192,33,150,239,90,118,151,76,132,61,38,147,203,171,112,236,147,87,9,207,95,83,73,163,232,219,183,243,104,34,188,49,193,15,103,60,170,158,204,70,179,145,144,69,25,203,17,153,92,117,108,203,182,0,110,215,35,122,49,154,120,100,26,77,46,189,70,21,174,140,96,173,45,156,151,243,132,199,149,240,149,55,246,200,187,108,203,232,60,97,184,248,151, +3,13,127,157,70,8,196,214,120,236,241,139,23,228,95,107,46,204,169,101,193,72,193,242,130,9,240,19,44,242,116,149,48,178,128,189,242,46,103,4,2,154,175,82,182,32,50,35,49,40,37,89,206,10,42,121,150,146,14,254,61,207,104,177,32,89,65,22,5,93,205,206,23,69,150,119,45,208,207,200,146,167,52,81,138,136,44,104,42,150,172,0,53,91,78,181,158,53,21,132,38,183,244,78,160,234,57,35,115,144,47,238,16,21,64,232,145,121,41,225,112,82,138,146,38,201,29,161,121,14,172,245,193,121,145,109,57,164,13,217,64,178,242,28,224,46,209,81,128,190,195,172,149,69,184,36,49,173,197,136,149,163,62,235,247,124,69,104,186,32,214,138,47,213,6,114,189,161,43,214,85,139,113,150,110,89,33,80,123,182,36,34,43,139,152,33,46,77,66,171,87,74,1,40,251,146,179,84,240,45,235,213,102,6,38,73,118,171,152,8,153,129,69,37,24,192,104,81,22,224,160,183,224,171,182,54,26,199,217,38,167,41,7,171,220,114,185,38,179,139,2,146,155,33,253,217, +5,89,150,105,172,216,150,194,88,95,65,148,200,110,15,152,213,184,183,10,210,55,29,199,29,116,223,170,223,87,14,49,110,159,92,146,15,42,122,200,59,182,153,3,223,189,88,13,118,99,21,145,67,164,78,63,253,70,147,146,125,34,234,35,154,130,22,124,162,130,202,69,181,55,13,81,75,107,131,69,252,226,31,85,171,89,42,197,55,202,217,159,136,254,140,166,157,217,37,104,215,2,81,183,211,138,123,164,47,100,52,85,24,218,235,179,243,104,138,39,119,107,56,111,42,203,181,140,102,124,81,65,87,33,215,142,55,171,101,133,227,168,63,42,80,179,206,172,171,144,28,133,15,234,181,88,212,233,78,15,193,215,8,127,129,194,184,165,9,36,28,2,1,210,154,113,183,163,136,180,176,60,233,206,87,168,24,211,24,51,144,73,202,147,202,165,199,89,212,223,59,10,146,118,233,236,124,214,211,20,128,222,229,172,187,255,176,59,235,142,212,97,85,81,57,230,152,253,48,217,247,17,150,42,109,252,222,131,158,7,137,103,251,190,209,219,109,66,224,165,170,90,130,76,94,252, +84,63,86,121,110,22,204,41,104,125,40,124,57,131,120,217,50,178,81,73,65,182,180,224,88,77,197,41,193,188,111,80,99,199,243,19,77,182,103,134,71,200,61,202,205,2,34,38,182,73,132,60,65,29,84,218,132,204,126,208,241,173,43,147,130,246,3,233,164,89,171,224,117,73,93,118,154,162,163,245,233,7,86,244,44,59,28,48,63,132,254,103,160,51,205,182,221,41,15,203,226,169,189,219,174,123,247,7,42,36,195,199,72,82,205,119,123,189,219,204,124,85,235,174,229,155,108,87,205,86,137,181,27,173,242,149,41,75,232,177,166,175,10,104,189,165,192,150,113,208,96,149,36,246,216,70,28,154,30,46,210,68,100,184,229,63,142,67,4,75,152,54,84,35,213,174,42,186,122,60,187,91,144,127,112,136,218,93,11,5,123,22,186,22,47,183,80,132,48,125,170,140,136,215,180,192,170,82,149,205,86,136,207,179,44,81,85,179,181,237,120,166,180,151,64,95,52,53,229,98,185,145,209,163,165,246,35,131,9,71,133,92,201,200,237,154,165,59,134,207,150,48,149,136,186,69, +155,206,108,50,11,117,63,84,2,118,72,191,101,242,33,178,71,123,4,200,255,73,44,77,79,83,124,116,122,192,236,0,196,158,203,232,101,28,179,92,154,92,62,230,48,45,208,206,237,27,6,65,173,198,30,29,190,48,70,53,33,13,9,75,213,14,128,211,145,180,88,49,105,22,180,241,245,16,86,28,248,202,136,138,117,86,38,80,188,127,38,57,162,36,209,225,120,5,39,24,225,217,79,100,81,170,122,209,140,164,13,148,30,206,79,213,65,75,200,26,86,73,207,46,148,252,5,201,97,52,85,195,31,77,36,68,61,76,158,12,238,14,169,10,23,178,201,96,30,35,113,89,8,72,201,14,175,177,193,199,45,168,128,233,47,7,21,88,230,76,180,225,233,144,255,105,38,73,158,65,253,131,16,215,108,103,23,200,19,132,37,38,238,2,135,91,182,151,219,199,167,146,163,158,218,13,191,39,188,246,236,216,171,189,252,1,111,81,12,205,210,10,41,212,1,163,7,24,148,146,4,106,4,218,201,164,18,204,223,169,228,75,142,89,38,24,222,193,48,4,230,48,118,177,13,143, +179,4,56,146,235,37,216,227,14,55,129,91,55,104,44,90,21,3,140,93,244,117,77,89,185,15,239,46,76,238,4,149,9,58,85,9,171,181,10,130,208,51,185,74,132,90,17,132,161,186,117,64,40,20,156,109,53,40,72,204,55,122,19,112,92,103,11,146,0,220,162,171,32,54,59,185,170,205,58,18,55,217,2,174,1,70,90,29,35,118,2,179,157,132,251,192,246,67,222,34,191,102,18,175,14,240,76,123,74,221,56,180,136,137,85,64,154,18,190,108,113,171,181,66,220,75,236,52,107,12,216,84,97,172,67,26,204,179,82,225,123,44,37,118,2,80,157,110,50,9,148,221,242,36,49,13,90,31,164,220,241,216,164,191,95,25,181,65,77,41,121,168,28,106,161,118,57,169,42,26,109,93,151,52,79,240,19,98,128,126,90,153,169,3,65,216,173,156,160,205,165,48,163,77,159,206,32,85,189,79,169,216,39,85,224,93,175,127,111,172,218,103,80,121,234,113,189,198,125,73,170,135,83,3,252,113,192,55,144,199,120,193,6,106,157,238,51,142,158,221,63,97,173,214,145,213, +30,40,38,247,223,23,205,71,246,59,140,56,135,13,106,155,241,133,185,135,161,192,65,131,106,178,88,141,254,40,83,87,15,203,76,106,250,150,31,195,149,30,30,209,37,22,59,40,55,18,221,196,143,86,29,165,74,93,51,85,114,176,152,227,228,106,145,127,155,119,23,42,45,185,208,55,121,221,21,140,140,122,11,162,90,215,103,166,155,24,190,21,40,83,173,9,203,42,222,17,33,111,105,44,203,250,109,138,42,92,170,254,168,172,87,53,82,189,158,16,85,59,20,38,218,176,216,240,66,200,30,234,75,13,25,246,133,110,96,78,144,230,101,135,218,97,142,234,85,239,78,84,101,212,214,57,45,133,94,170,129,179,29,26,45,175,0,179,42,141,180,220,19,177,249,182,154,37,114,40,84,25,90,141,198,53,220,99,21,172,147,165,170,188,189,254,245,245,108,250,234,253,135,255,246,244,215,119,239,127,251,229,148,112,66,96,248,6,135,45,52,62,113,2,145,29,249,19,171,3,114,154,115,185,161,226,179,242,170,214,209,30,230,31,100,248,255,82,187,105,124,3,232,31,204,151, +155,198,53,71,8,67,163,255,210,154,2,94,173,105,186,130,78,119,216,71,204,84,240,37,50,201,180,19,245,181,55,155,45,106,50,34,162,228,82,181,123,168,245,16,216,133,228,113,153,208,66,235,215,205,232,164,118,3,215,8,19,246,15,248,175,125,225,48,146,167,122,14,103,82,104,188,213,229,172,105,188,39,248,224,90,252,179,100,197,221,211,160,148,216,51,17,53,37,173,125,187,196,203,162,30,100,241,62,141,197,66,189,85,53,115,197,206,0,124,74,20,93,11,245,231,211,12,148,216,247,97,144,229,63,235,33,203,240,216,195,142,187,79,129,222,252,81,189,154,104,238,232,173,246,96,254,239,71,99,213,111,212,14,174,204,209,255,0,156,6,106,217, diff --git a/uppsrc/CtrlLib/init b/uppsrc/CtrlLib/init index 1b86bc0f5..3cb013a7a 100644 --- a/uppsrc/CtrlLib/init +++ b/uppsrc/CtrlLib/init @@ -2,7 +2,7 @@ #define _CtrlLib_icpp_init_stub #include "CtrlCore/init" #include "PdfDraw/init" -#define BLITZ_INDEX__ F276E594C5A7D877879CBAFD132B40551 +#define BLITZ_INDEX__ F65E45BF916E196410AC2114E5BFD9D81 #include "CtrlLib.icpp" #undef BLITZ_INDEX__ #endif