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
Fix SWIG C# Build
[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
7002568
..
69cbd04
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 {
@@
-44,6
+45,9
@@
%}
#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>
@@
-64,6
+68,7
@@
#include <dali-toolkit/devel-api/builder/builder.h>
#include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
#include <dali-toolkit/devel-api/builder/builder.h>
#include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
+
#include <dali-toolkit/devel-api/controls/popup/popup.h>
#include <dali-toolkit/devel-api/controls/progress-bar/progress-bar.h>
#include <dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h>
#include <dali-toolkit/devel-api/controls/popup/popup.h>
#include <dali-toolkit/devel-api/controls/progress-bar/progress-bar.h>
#include <dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h>
@@
-76,6
+81,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
@@
-172,10
+179,7
@@
using namespace Dali;
using namespace Dali::Toolkit;
%}
using namespace Dali::Toolkit;
%}
-//%feature("director") Dali::Internal::CustomActorImpl;
-//%feature("notabstract") Dali::Internal::CustomActorImpl;
-//%feature("director") Dali::Toolkit::Internal::Control;
-//%feature("notabstract") Dali::Toolkit::Internal::Control;
+%feature("director") Dali::Toolkit::Internal::Control;
%feature("notabstract") Dali::Toolkit::FixedRuler;
%feature("notabstract") Dali::Toolkit::DefaultRuler;
%feature("notabstract") Dali::Toolkit::FixedRuler;
%feature("notabstract") Dali::Toolkit::DefaultRuler;