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
Add some APIs into web view.
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
dummy-control.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
index
7ca109c
..
7d0c661
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
@@
-93,7
+93,7
@@
DummyControl DummyControlImpl::New()
}
DummyControlImpl::DummyControlImpl()
}
DummyControlImpl::DummyControlImpl()
-: Control( ControlBehaviour(
REQUIRES_STYLE_CHANGE_SIGNALS
) ),
+: Control( ControlBehaviour() ),
mCustomSlot1Called(false)
{
}
mCustomSlot1Called(false)
{
}
@@
-174,7
+174,7
@@
void DummyControlImpl::SetProperty( BaseObject* object, Dali::Property::Index in
case Toolkit::DummyControl::Property::FOCUS_VISUAL:
case Toolkit::DummyControl::Property::LABEL_VISUAL:
{
case Toolkit::DummyControl::Property::FOCUS_VISUAL:
case Toolkit::DummyControl::Property::LABEL_VISUAL:
{
- Property::Map* map = value.GetMap();
+
const
Property::Map* map = value.GetMap();
if( map != NULL )
{
VisualFactory visualFactory = VisualFactory::Get();
if( map != NULL )
{
VisualFactory visualFactory = VisualFactory::Get();