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
(Touch) Updated programming guide, Automated Tests & KeyboardFocusManager to use...
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
utc-Dali-PushButton.cpp
diff --git
a/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp
b/automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp
index
69698fa
..
edaf7fd
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-PushButton.cpp
@@
-329,7
+329,7
@@
public:
Test mTest;
};
Test mTest;
};
-static bool TestCallback(Actor actor, const Touch
Event
& event)
+static bool TestCallback(Actor actor, const Touch
Data
& event)
{
return true;
}
{
return true;
}
@@
-384,7
+384,7
@@
int UtcDaliPushButtonInterruptEventWhenInsensitive(void)
// * Actor's touch event is connected to a callback function
// and this callback function consumes the event.
// * Actor's touch event is connected to a callback function
// and this callback function consumes the event.
- actor.Touch
ed
Signal().Connect( &TestCallback );
+ actor.TouchSignal().Connect( &TestCallback );
// * Button's pressed signal is connected to a callback function
// which also consumes the event.
// * Button's pressed signal is connected to a callback function
// which also consumes the event.
@@
-527,7
+527,7
@@
int UtcDaliPushButtonInterruptEventWhenNonVisible(void)
// * Actor's touch event is connected to a callback function
// and this callback function consumes the event.
// * Actor's touch event is connected to a callback function
// and this callback function consumes the event.
- actor.Touch
ed
Signal().Connect( &TestCallback );
+ actor.TouchSignal().Connect( &TestCallback );
// * Button's pressed signal is connected to a callback function
// which also consumes the event.
// * Button's pressed signal is connected to a callback function
// which also consumes the event.