Merge changes Ia2ec4b45,Ied29583a into devel/master

[platform/core/uifw/dali-toolkit.git] / plugins / dali-swig / SWIG / dali-core.i

diff --git a/plugins/dali-swig/SWIG/dali-core.i b/plugins/dali-swig/SWIG/dali-core.i
index d787496..20eb449 100644 (file)
--- a/plugins/dali-swig/SWIG/dali-core.i
+++ b/plugins/dali-swig/SWIG/dali-core.i
@@ -80,8 +80,11 @@
 %ignore *::GetExtension();
 %ignore *::Initialize(Internal::CustomActor&);
 %ignore *::GetOwner() const;
+%ignore *::ParentOrigin::DEFAULT;
+%ignore *::AnchorPoint::DEFAULT;
+%ignore *::SetPositionInheritanceMode(PositionInheritanceMode);
+%ignore *::GetKeyValue(SizeType) const;
 
-%rename(ParentOriginDefault) Dali::ParentOrigin::DEFAULT;
 %rename(ParentOriginTop) Dali::ParentOrigin::TOP;
 %rename(ParentOriginBottom) Dali::ParentOrigin::BOTTOM;
 %rename(ParentOriginLeft) Dali::ParentOrigin::LEFT;
@@ -96,7 +99,6 @@
 %rename(ParentOriginBottomLeft) Dali::ParentOrigin::BOTTOM_LEFT;
 %rename(ParentOriginBottomCenter) Dali::ParentOrigin::BOTTOM_CENTER;
 %rename(ParentOriginBottomRight) Dali::ParentOrigin::BOTTOM_RIGHT;
-%rename(AnchorPointDefault) Dali::AnchorPoint::DEFAULT;
 %rename(AnchorPointTop) Dali::AnchorPoint::TOP;
 %rename(AnchorPointBottom) Dali::AnchorPoint::BOTTOM;
 %rename(AnchorPointLeft) Dali::AnchorPoint::LEFT;
@@ -172,6 +174,7 @@ typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair;
 %include <dali/public-api/object/property-index-ranges.h>
 %include <dali/public-api/object/property.h>
 %include <dali/public-api/object/property-array.h>
+%include <dali/public-api/object/property-key.h>
 %include <dali/public-api/object/property-map.h>
 %include <dali/public-api/object/property-types.h>
 %include <dali/public-api/object/property-value.h>
@@ -254,10 +257,9 @@ typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair;
 %include <dali/public-api/images/native-image.h>
 %include <dali/public-api/images/native-image-interface.h>
 %include <dali/public-api/images/resource-image.h>
-%include <dali/public-api/images/nine-patch-image.h>
 %include <dali/public-api/images/frame-buffer-image.h>
+%include <dali/devel-api/images/nine-patch-image.h>
 
-%include <dali/public-api/actors/blending.h>
 %include <dali/public-api/actors/camera-actor.h>
 
 %template(StringValuePair) std::pair<std::string, Dali::Property::Value>;
@@ -294,3 +296,18 @@ typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair;
 %template(TapGestureDetectedSignal) Dali::Signal<void (Dali::Actor, const Dali::TapGesture&)>;
 %template(AnimationSignal) Dali::Signal<void(Dali::Animation&)>;
 %template(ResourceImageSignal) Dali::Signal<void(Dali::ResourceImage)>;
+
+%define QUATERNION_TYPEMAP_HELPER(NameSpace, ClassName)
+%typemap(cscode) NameSpace::ClassName %{
+  public Quaternion(Radian angle, Dali.CSharp.Position pos) : this(angle, new Vector3(pos.X, pos.Y, pos.Z) {
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+
+%}
+%enddef
+
+namespace Dali
+{
+  QUATERNION_TYPEMAP_HELPER( Dali, Quaternion);
+}
+