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 "Fix the warning log in Control causing the wrong position" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-swig
/
SWIG
/
dali.i
diff --git
a/plugins/dali-swig/SWIG/dali.i
b/plugins/dali-swig/SWIG/dali.i
index
3659b21
..
1f5149b
100755
(executable)
--- a/
plugins/dali-swig/SWIG/dali.i
+++ b/
plugins/dali-swig/SWIG/dali.i
@@
-25,6
+25,7
@@
#endif
%include exception.i
#endif
%include exception.i
+%include dali-gc.i
%exception {
try {
%exception {
try {
@@
-77,6
+78,8
@@
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
#include <dali-toolkit/devel-api/visual-factory/transition-data.h>
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
#include <dali-toolkit/devel-api/visual-factory/transition-data.h>
+#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
+
#include <dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h>
// add here SWIG version check
#include <dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h>
// add here SWIG version check
@@
-193,7
+196,6
@@
using namespace Dali::Toolkit;
%include events/gaussian-blur-view-event.i
%include events/image-event.i
%include events/itemview-event.i
%include events/gaussian-blur-view-event.i
%include events/image-event.i
%include events/itemview-event.i
-%include events/keyboardFocusManager-event.i
%include events/objectregistry-event.i
%include events/popup-event.i
%include events/pinchgesture-event.i
%include events/objectregistry-event.i
%include events/popup-event.i
%include events/pinchgesture-event.i
@@
-216,6
+218,7
@@
using namespace Dali::Toolkit;
%include events/videoview-event.i
%include alphafunction.i
%include events/videoview-event.i
%include alphafunction.i
+%include name-changed.i
%include dali-operator.i
%include dali-core.i
%include dali-operator.i
%include dali-core.i