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
Updated Model3dView control to use SetTexture
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
buttons
/
push-button-impl.h
diff --git
a/dali-toolkit/internal/controls/buttons/push-button-impl.h
b/dali-toolkit/internal/controls/buttons/push-button-impl.h
index
f1925a3
..
a003e6d
100644
(file)
--- a/
dali-toolkit/internal/controls/buttons/push-button-impl.h
+++ b/
dali-toolkit/internal/controls/buttons/push-button-impl.h
@@
-96,47
+96,47
@@
public:
private: // From Button
/**
private: // From Button
/**
- * @copydoc Toolkit::Internal::Button::On
ButtonInitialize()
+ * @copydoc Toolkit::Internal::Button::On
Initialize
*/
*/
- virtual void On
Button
Initialize();
+ virtual void OnInitialize();
/**
/**
- * @copydoc Toolkit::Internal::Button::OnLabelSet
()
+ * @copydoc Toolkit::Internal::Button::OnLabelSet
*/
*/
- virtual void OnLabelSet();
+ virtual void OnLabelSet(
bool noPadding
);
/**
/**
- * @copydoc Toolkit::Internal::Button::OnButtonImageSet
()
+ * @copydoc Toolkit::Internal::Button::OnButtonImageSet
*/
virtual void OnButtonImageSet();
/**
*/
virtual void OnButtonImageSet();
/**
- * @copydoc Toolkit::Internal::Button::OnSelectedImageSet
()
+ * @copydoc Toolkit::Internal::Button::OnSelectedImageSet
*/
virtual void OnSelectedImageSet();
/**
*/
virtual void OnSelectedImageSet();
/**
- * @copydoc Toolkit::Internal::Button::OnBackgroundImage
()
+ * @copydoc Toolkit::Internal::Button::OnBackgroundImage
*/
virtual void OnBackgroundImageSet();
/**
*/
virtual void OnBackgroundImageSet();
/**
- * @copydoc Toolkit::Internal::Button::OnSelectedBackgroundImageSet
()
+ * @copydoc Toolkit::Internal::Button::OnSelectedBackgroundImageSet
*/
virtual void OnSelectedBackgroundImageSet();
/**
*/
virtual void OnSelectedBackgroundImageSet();
/**
- * @copydoc Toolkit::Internal::Button::OnDisabledImageSet
()
+ * @copydoc Toolkit::Internal::Button::OnDisabledImageSet
*/
virtual void OnDisabledImageSet();
/**
*/
virtual void OnDisabledImageSet();
/**
- * @copydoc Toolkit::Internal::Button::OnDisabledSelectedImageSet
()
+ * @copydoc Toolkit::Internal::Button::OnDisabledSelectedImageSet
*/
virtual void OnDisabledSelectedImageSet();
/**
*/
virtual void OnDisabledSelectedImageSet();
/**
- * @copydoc Toolkit::Internal::Button::OnDisabledBackgroundImageSet
()
+ * @copydoc Toolkit::Internal::Button::OnDisabledBackgroundImageSet
*/
virtual void OnDisabledBackgroundImageSet();
*/
virtual void OnDisabledBackgroundImageSet();