Modified dali.i and dali-toolkit.i files to add support for the changes made into... 03/99403/2
authorUmar <m.umar@partner.samsung.com>
Tue, 22 Nov 2016 18:42:31 +0000 (18:42 +0000)
committerRichard Huang <r.huang@samsung.com>
Wed, 23 Nov 2016 11:26:58 +0000 (03:26 -0800)
Change-Id: I59c6e52efea584a48afd1db3b46117c971453d83

plugins/dali-swig/SWIG/dali-toolkit.i
plugins/dali-swig/SWIG/dali.i

index c9f585d4fd3a636642320eeb15d5dfe29c8fd00a..56693b8c941e2644256df6e38a8a9dac37522b36 100644 (file)
@@ -97,6 +97,7 @@
 %rename(View) Dali::Toolkit::Control;
 %rename(ViewImpl) Dali::Toolkit::Internal::Control;
 %rename(VisualBase) Dali::Toolkit::Visual::Base;
+%rename(LoadImageSynchronously) Dali::Toolkit::SyncImageLoader::Load;
 %rename(ControlOrientationType) Dali::Toolkit::ControlOrientation::Type;
 %rename(DefaultItemLayoutType) Dali::Toolkit::DefaultItemLayout::Type;
 %rename(NewItemLayout) Dali::Toolkit::DefaultItemLayout::New;
@@ -185,7 +186,7 @@ typedef Dali::IntrusivePtr<Dali::Toolkit::Ruler> RulerPtr;
 %include <dali-toolkit/public-api/visuals/image-visual-properties.h>
 %include <dali-toolkit/public-api/visuals/mesh-visual-properties.h>
 %include <dali-toolkit/public-api/visuals/primitive-visual-properties.h>
-%include <dali-toolkit/public-api/visuals/text-visual-properties.h>
+%include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
 
 %include <dali-toolkit/devel-api/builder/builder.h>
 
@@ -237,6 +238,10 @@ typedef Dali::IntrusivePtr<Dali::Toolkit::Ruler> RulerPtr;
 %include <dali-toolkit/devel-api/visual-factory/visual-base.h>
 %include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 
+%include <dali-toolkit/public-api/image-loader/async-image-loader.h>
+%include <dali-toolkit/public-api/image-loader/sync-image-loader.h>
+%include <dali-toolkit/public-api/text/rendering-backend.h>
+
 %template(ItemIdContainer) std::vector<unsigned int>;
 %template(Item) std::pair<unsigned int, Dali::Actor>;
 %template(ItemContainer) std::vector<std::pair<unsigned int, Dali::Actor>>;
index fdcd4b26cc1faa33f5778ce7d93f3b8b526f06b8..4a612e9000eddb681f2464fc4ce854b52800a979 100755 (executable)
@@ -78,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/visuals/text-visual-properties.h>
+
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h>
 
 // add here SWIG version check