From 4896d9cc82e1459ab29597aaf2550ff49865bec9 Mon Sep 17 00:00:00 2001 From: cxl Date: Tue, 30 Sep 2014 11:55:59 +0000 Subject: [PATCH] CtrlLib: Removed debugging #define in Animate git-svn-id: svn://ultimatepp.org/upp/trunk@7749 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp | 3 ++- uppsrc/CtrlLib/CtrlUtil.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp b/uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp index 3be83eb7f..59859b664 100644 --- a/uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp +++ b/uppsrc/CtrlCore/src.tpp/Ctrl$en-us.tpp @@ -906,6 +906,7 @@ Ctrls. &] [s5;:Ctrl`:`:AddChild`(Ctrl`*`,Ctrl`*`):%- [@(0.0.255) void]_[* AddChild]([_^`:`:Ctrl^ Ctrl ]_`*[*@3 child], [_^`:`:Ctrl^ Ctrl]_`*[*@3 insafter])&] [s2;b17;a17; Inserts child Ctrl after another Ctrl that is already +child. If [%-*@3 insafter] is NULL, child is inserted as the first child.&] [s7;i1120;a17; [%-*C@3 child]-|Pointer to child Ctrl.&] [s7;i1120;a17; [%-*C@3 insafter]-|Ctrl that will be before inserted @@ -915,7 +916,7 @@ Ctrl.&] [s5;:Ctrl`:`:AddChildBefore`(Ctrl`*`,Ctrl`*`):%- [@(0.0.255) void]_[* AddChildBefore]([_^`:`:Ctrl^ C trl]_`*[*@3 child], [_^`:`:Ctrl^ Ctrl]_`*[*@3 insbefore])&] [s2;b17;a17; Inserts child Ctrl before another Ctrl that is already -child.&] +child. If [%-*@3 insbefore], child is inserted as last child.&] [s7;i1120;a17; [%-*C@3 child]-|Pointer to child Ctrl.&] [s7;i1120;a17; [%-*C@3 insbefore]-|Ctrl that will be after inserted Ctrl.&] diff --git a/uppsrc/CtrlLib/CtrlUtil.cpp b/uppsrc/CtrlLib/CtrlUtil.cpp index c84f70fe3..0267c441c 100644 --- a/uppsrc/CtrlLib/CtrlUtil.cpp +++ b/uppsrc/CtrlLib/CtrlUtil.cpp @@ -4,7 +4,7 @@ NAMESPACE_UPP #define LLOG(x) // RLOG(x) -#define SLOWANIMATION +// #define SLOWANIMATION #define IMAGECLASS CtrlImg #define IMAGEFILE