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
Conversion to Apache 2.0 license
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
internal
/
controls
/
buttons
/
button-impl.h
diff --git
a/base/dali-toolkit/internal/controls/buttons/button-impl.h
b/base/dali-toolkit/internal/controls/buttons/button-impl.h
index
a1be790
..
441a725
100644
(file)
--- a/
base/dali-toolkit/internal/controls/buttons/button-impl.h
+++ b/
base/dali-toolkit/internal/controls/buttons/button-impl.h
@@
-38,14
+38,14
@@
namespace Internal
/**
* Button is the base class implementation for all buttons.
*/
/**
* Button is the base class implementation for all buttons.
*/
-class Button : public Control
Impl
+class Button : public Control
{
public:
// Properties
enum
{
{
public:
// Properties
enum
{
- BUTTON_PROPERTY_START_INDEX = Control
Impl
::CONTROL_PROPERTY_END_INDEX + 1,
+ BUTTON_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
BUTTON_PROPERTY_END_INDEX = BUTTON_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
};
BUTTON_PROPERTY_END_INDEX = BUTTON_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
};
@@
-173,7
+173,7
@@
protected: // From CustomActorImpl
*/
virtual bool OnTouchEvent( const TouchEvent& event );
*/
virtual bool OnTouchEvent( const TouchEvent& event );
-private: // From Control
Impl
+private: // From Control
/**
* @copydoc Toolkit::Control::OnInitialize()
/**
* @copydoc Toolkit::Control::OnInitialize()