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
[dali_1.0.42] Merge branch 'tizen'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
magnifier
/
magnifier-impl.h
diff --git
a/dali-toolkit/internal/controls/magnifier/magnifier-impl.h
b/dali-toolkit/internal/controls/magnifier/magnifier-impl.h
index
4def324
..
d4fea4e
100644
(file)
--- a/
dali-toolkit/internal/controls/magnifier/magnifier-impl.h
+++ b/
dali-toolkit/internal/controls/magnifier/magnifier-impl.h
@@
-26,7
+26,7
@@
// 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/magnifier/magnifier.h>
+#include <dali-toolkit/
devel
-api/controls/magnifier/magnifier.h>
namespace Dali
{
namespace Dali
{
@@
-117,7
+117,7
@@
private:
private:
private:
- virtual void On
Control
SizeSet(const Vector3& targetSize);
+ virtual void OnSizeSet(const Vector3& targetSize);
private:
private: