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
Added style names for images and text labels of Slider
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
buttons
/
push-button-impl.cpp
diff --git
a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
index
50d85e5
..
2190016
100644
(file)
--- a/
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
+++ b/
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
@@
-20,7
+20,7
@@
// EXTERNAL INCLUDES
#include <dali/public-api/object/type-registry.h>
// EXTERNAL INCLUDES
#include <dali/public-api/object/type-registry.h>
-#include <dali/
devel
-api/object/type-registry-helper.h>
+#include <dali/
public
-api/object/type-registry-helper.h>
#include <dali/public-api/images/resource-image.h>
#include <dali/devel-api/scripting/scripting.h>
#include <dali/public-api/images/resource-image.h>
#include <dali/devel-api/scripting/scripting.h>
@@
-127,8
+127,10
@@
PushButton::~PushButton()
{
}
{
}
-void PushButton::On
Button
Initialize()
+void PushButton::OnInitialize()
{
{
+ Button::OnInitialize();
+
// Push button requires the Leave event.
Actor self = Self();
self.SetLeaveRequired( true );
// Push button requires the Leave event.
Actor self = Self();
self.SetLeaveRequired( true );