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.2.21] Merge branch '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
69cbd04
..
1f5149b
100755
(executable)
--- a/
plugins/dali-swig/SWIG/dali.i
+++ b/
plugins/dali-swig/SWIG/dali.i
@@
-45,9
+45,6
@@
%}
#endif
%}
#endif
-// This define is needed to fix SWIG compilation error when compiling / parsing DALi deprecated APIs.
-#define DALI_DEPRECATED_API
-
%{
#include <dali/dali.h>
#include <dali-toolkit/dali-toolkit.h>
%{
#include <dali/dali.h>
#include <dali-toolkit/dali-toolkit.h>
@@
-199,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
@@
-222,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