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 "Do not substarct outline width in text-controller" 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
899a575
..
10130f7
100755
(executable)
--- a/
dali-toolkit/devel-api/controls/control-wrapper-impl.h
+++ b/
dali-toolkit/devel-api/controls/control-wrapper-impl.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_CONTROL_WRAPPER_H
/*
#define DALI_TOOLKIT_INTERNAL_CONTROL_WRAPPER_H
/*
- * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-45,7
+45,7
@@
typedef IntrusivePtr< ControlWrapper > ControlWrapperPtr;
/**
* @copydoc Toolkit::ControlWrapper
*/
/**
* @copydoc Toolkit::ControlWrapper
*/
-class DALI_
IMPOR
T_API ControlWrapper : public Control
+class DALI_
TOOLKI
T_API ControlWrapper : public Control
{
public:
{
public:
@@
-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:
/**