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
Fix VD prevent issues
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
slider
/
slider-impl.h
diff --git
a/dali-toolkit/internal/controls/slider/slider-impl.h
b/dali-toolkit/internal/controls/slider/slider-impl.h
index
a8003c7
..
ea652fd
100755
(executable)
--- a/
dali-toolkit/internal/controls/slider/slider-impl.h
+++ b/
dali-toolkit/internal/controls/slider/slider-impl.h
@@
-21,10
+21,11
@@
// EXTERNAL INCLUDES
#include <dali/public-api/actors/image-actor.h>
#include <dali/public-api/adaptor-framework/timer.h>
// EXTERNAL INCLUDES
#include <dali/public-api/actors/image-actor.h>
#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/object/property-array.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/
public
-api/controls/slider/slider.h>
+#include <dali-toolkit/
devel
-api/controls/slider/slider.h>
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
namespace Dali
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
namespace Dali
@@
-287,9
+288,9
@@
protected:
virtual ~Slider();
/**
virtual ~Slider();
/**
- * @copydoc C
ontrol::OnControl
SizeSet( const Vector3& size )
+ * @copydoc C
ustomActorImpl::On
SizeSet( const Vector3& size )
*/
*/
- virtual void On
Control
SizeSet( const Vector3& size );
+ virtual void OnSizeSet( const Vector3& size );
private:
private: