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
Merge "Note that some Text propeties in devel api can't be changed" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
control-wrapper-impl.h
diff --git
a/dali-toolkit/devel-api/controls/control-wrapper-impl.h
b/dali-toolkit/devel-api/controls/control-wrapper-impl.h
index
8a35ee9
..
e5c371d
100755
(executable)
--- a/
dali-toolkit/devel-api/controls/control-wrapper-impl.h
+++ b/
dali-toolkit/devel-api/controls/control-wrapper-impl.h
@@
-118,7
+118,7
@@
public: // From Control
/**
* @ref Dali::Toolkit::DevelControl::RegisterVisual()
*/
/**
* @ref Dali::Toolkit::DevelControl::RegisterVisual()
*/
- void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual,
floa
t depthIndex );
+ void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual,
in
t depthIndex );
/**
* @ref Dali::Toolkit::DevelControl::RegisterVisual()
/**
* @ref Dali::Toolkit::DevelControl::RegisterVisual()
@@
-128,7
+128,7
@@
public: // From Control
/**
* @ref Dali::Toolkit::DevelControl::RegisterVisual()
*/
/**
* @ref Dali::Toolkit::DevelControl::RegisterVisual()
*/
- void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled,
floa
t depthIndex );
+ void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled,
in
t depthIndex );
/**
* @ref Dali::Toolkit::DevelControl::UnregisterVisual()
/**
* @ref Dali::Toolkit::DevelControl::UnregisterVisual()
@@
-168,6
+168,13
@@
public: // From Control
*/
void ApplyThemeStyle();
*/
void ApplyThemeStyle();
+public:
+ /**
+ * Enable access to non-native type info from native side
+ * @return The type info that was registered on this type
+ */
+ Dali::TypeInfo GetTypeInfo();
+
protected:
/**
protected:
/**