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
[dali_1.2.16] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
wireframe
/
wireframe-visual.h
diff --git
a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h
b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h
index
c4ff5c4
..
d35beb3
100644
(file)
--- a/
dali-toolkit/internal/visuals/wireframe/wireframe-visual.h
+++ b/
dali-toolkit/internal/visuals/wireframe/wireframe-visual.h
@@
-66,6
+66,11
@@
protected:
virtual ~WireframeVisual();
/**
virtual ~WireframeVisual();
/**
+ * @copydoc Visual::Base::DoSetProperties()
+ */
+ virtual void DoSetProperties( const Property::Map& propertyMap );
+
+ /**
* @copydoc Visual::Base::DoSetOnStage
*/
virtual void DoSetOnStage( Actor& actor );
* @copydoc Visual::Base::DoSetOnStage
*/
virtual void DoSetOnStage( Actor& actor );
@@
-76,14
+81,9
@@
protected:
virtual void DoCreatePropertyMap( Property::Map& map ) const;
/**
virtual void DoCreatePropertyMap( Property::Map& map ) const;
/**
- * @copydoc Visual::Base::DoSetProperty
- */
- virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue );
-
- /**
- * @copydoc Visual::Base::DoGetProperty
+ * @copydoc Visual::Base::OnSetTransform
*/
*/
- virtual
Dali::Property::Value DoGetProperty( Dali::Property::Index index
);
+ virtual
void OnSetTransform(
);
private:
/**
private:
/**