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
Remove handle::operator=(NULL) as it is duplicating handle.Reset() functionality...
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
public-api
/
controls
/
control-impl.cpp
diff --git
a/base/dali-toolkit/public-api/controls/control-impl.cpp
b/base/dali-toolkit/public-api/controls/control-impl.cpp
index
65e0aa8
..
87e7a0d
100644
(file)
--- a/
base/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/
base/dali-toolkit/public-api/controls/control-impl.cpp
@@
-749,7
+749,7
@@
void Control::SetBackground( Image image )
{
// Remove Current actor, unset AFTER removal so that we do not inform deriving classes
Self().Remove( background.actor );
- background.actor
= NULL
;
+ background.actor
.Reset()
;
}
ImageActor imageActor = ImageActor::New( image );