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 "Stop Overriding Actor::Add() & Actor::Remove()" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
bloom-view
/
bloom-view.cpp
diff --git
a/dali-toolkit/devel-api/controls/bloom-view/bloom-view.cpp
b/dali-toolkit/devel-api/controls/bloom-view/bloom-view.cpp
index
c7cfc9e
..
2f71883
100644
(file)
--- a/
dali-toolkit/devel-api/controls/bloom-view/bloom-view.cpp
+++ b/
dali-toolkit/devel-api/controls/bloom-view/bloom-view.cpp
@@
-77,16
+77,6
@@
BloomView BloomView::DownCast( BaseHandle handle )
return Control::DownCast<BloomView, Internal::BloomView>(handle);
}
return Control::DownCast<BloomView, Internal::BloomView>(handle);
}
-void BloomView::Add(Actor child)
-{
- GetImpl(*this).Add(child);
-}
-
-void BloomView::Remove(Actor child)
-{
- GetImpl(*this).Remove(child);
-}
-
void BloomView::Activate()
{
GetImpl(*this).Activate();
void BloomView::Activate()
{
GetImpl(*this).Activate();