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
Moved PushButton::SetButtonImage etc to Button base class.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
buttons
/
push-button.h
diff --git
a/dali-toolkit/public-api/controls/buttons/push-button.h
b/dali-toolkit/public-api/controls/buttons/push-button.h
index
dd3ffb6
..
a74610a
100644
(file)
--- a/
dali-toolkit/public-api/controls/buttons/push-button.h
+++ b/
dali-toolkit/public-api/controls/buttons/push-button.h
@@
-121,12
+121,7
@@
public:
*/
static PushButton DownCast( BaseHandle handle );
*/
static PushButton DownCast( BaseHandle handle );
- /**
- * @brief Sets the button image.
- *
- * @param[in] image The button image.
- */
- void SetButtonImage( Image image );
+ using Button::SetButtonImage;
/**
* @brief SetButtonImage
/**
* @brief SetButtonImage
@@
-145,12
+140,7
@@
public:
*/
Actor GetButtonImage() const;
*/
Actor GetButtonImage() const;
- /**
- * @brief Sets the background image.
- *
- * @param[in] image The background image.
- */
- void SetBackgroundImage( Image image );
+ using Button::SetBackgroundImage;
/**
* @brief SetBackgroundImage
/**
* @brief SetBackgroundImage
@@
-169,12
+159,7
@@
public:
*/
Actor GetBackgroundImage() const;
*/
Actor GetBackgroundImage() const;
- /**
- * @brief Sets the selected image.
- *
- * @param[in] image The selected image.
- */
- void SetSelectedImage( Image image );
+ using Button::SetSelectedImage;
/**
* @copydoc SetSelectedImage( Image image )
/**
* @copydoc SetSelectedImage( Image image )
@@
-188,12
+173,7
@@
public:
*/
Actor GetSelectedImage() const;
*/
Actor GetSelectedImage() const;
- /**
- * @brief Sets the selected background image.
- *
- * @param[in] image The selected background image.
- */
- void SetSelectedBackgroundImage( Image image );
+ using Button::SetSelectedBackgroundImage;
/**
* @copydoc SetSelectedBackgroundImage( Image image )
/**
* @copydoc SetSelectedBackgroundImage( Image image )
@@
-207,12
+187,7
@@
public:
*/
Actor GetSelectedBackgroundImage() const;
*/
Actor GetSelectedBackgroundImage() const;
- /**
- * @brief Sets the disabled background image.
- *
- * @param[in] image The disabled background image.
- */
- void SetDisabledBackgroundImage( Image image );
+ using Button::SetDisabledBackgroundImage;
/**
* @copydoc SetDisabledBackgroundImage( Image image )
/**
* @copydoc SetDisabledBackgroundImage( Image image )
@@
-226,12
+201,7
@@
public:
*/
Actor GetDisabledBackgroundImage() const;
*/
Actor GetDisabledBackgroundImage() const;
- /**
- * @brief Sets the disabled button image.
- *
- * @param[in] image The disabled button image.
- */
- void SetDisabledImage( Image image );
+ using Button::SetDisabledImage;
/**
* @copydoc SetDisabledImage( Image image )
/**
* @copydoc SetDisabledImage( Image image )