projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Changed README to README.md" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
text
/
text-visual.h
diff --git
a/dali-toolkit/internal/visuals/text/text-visual.h
b/dali-toolkit/internal/visuals/text/text-visual.h
index
c609990
..
47289d1
100644
(file)
--- a/
dali-toolkit/internal/visuals/text/text-visual.h
+++ b/
dali-toolkit/internal/visuals/text/text-visual.h
@@
-19,6
+19,7
@@
*/
// EXTERNAL INCLUDES
*/
// EXTERNAL INCLUDES
+#include <dali/devel-api/object/weak-handle.h>
#include <dali/public-api/common/intrusive-ptr.h>
// INTERNAL INCLUDES
#include <dali/public-api/common/intrusive-ptr.h>
// INTERNAL INCLUDES
@@
-124,9
+125,9
@@
protected:
// from Visual::Base
/**
// from Visual::Base
/**
- * @copydoc Visual::Base::Do
Initialize
()
+ * @copydoc Visual::Base::Do
SetProperties
()
*/
*/
- virtual void Do
Initialize( Actor& actor,
const Property::Map& propertyMap );
+ virtual void Do
SetProperties(
const Property::Map& propertyMap );
/**
* @copydoc Visual::Base::DoSetOnStage()
/**
* @copydoc Visual::Base::DoSetOnStage()
@@
-168,7
+169,7
@@
private:
private:
Text::ControllerPtr mController; ///< The text's controller.
private:
Text::ControllerPtr mController; ///< The text's controller.
-
Actor
mSelf;
+
WeakHandle<Actor>
mSelf;
Text::RendererPtr mRenderer;
Text::TextScrollerPtr mTextScroller;
Text::RendererPtr mRenderer;
Text::TextScrollerPtr mTextScroller;