X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=plugins%2Fdali-swig%2FSWIG%2Fdali-core.i;h=04a17324d89d35eac249447e45504f8cfd43a3e8;hp=e94183492fb57113412e1352da64e52002ffda9e;hb=0802b509ef2af3d87444003ab9b66224109447f4;hpb=b34b7545bf6bb2526b2a0544868a4aec8ee16335

diff --git a/plugins/dali-swig/SWIG/dali-core.i b/plugins/dali-swig/SWIG/dali-core.i
old mode 100644
new mode 100755
index e941834..04a1732
--- 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;
@@ -118,6 +120,7 @@
 %rename(SizeScalePolicyType) Dali::SizeScalePolicy::Type;
 %rename(HorizontalAlignmentType) Dali::HorizontalAlignment::Type;
 %rename(VerticalAlignmentType) Dali::VerticalAlignment::Type;
+%rename(ClippingModeType) Dali::ClippingMode::Type;
 %rename(FilterModeType) Dali::FilterMode::Type;
 %rename(WrapModeType) Dali::WrapMode::Type;
 %rename(PixelFormat) Dali::Pixel::Format;
@@ -129,6 +132,7 @@
 %rename(DepthWriteModeType) Dali::DepthWriteMode::Type;
 %rename(DepthTestModeType) Dali::DepthTestMode::Type;
 %rename(DepthFunctionType) Dali::DepthFunction::Type;
+%rename(RenderModeType) Dali::RenderMode::Type;
 %rename(StencilFunctionType) Dali::StencilFunction::Type;
 %rename(StencilModeType) Dali::StencilMode::Type;
 %rename(StencilOperationType) Dali::StencilOperation::Type;
@@ -143,6 +147,7 @@
 %rename(BlendingEquationType) Dali::BlendingEquation::Type;
 %rename(CameraType) Dali::Camera::Type;
 %rename(LayerBehavior) Dali::Layer::Behavior;
+%rename(DaliEndAction) Dali::Animation::EndAction;
 
 typedef std::pair<std::string, Dali::Property::Value> StringValuePair;
 typedef std::vector<Dali::TouchPoint> TouchPointContainer;
@@ -151,6 +156,7 @@ typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair;
 %include <dali/public-api/object/ref-object.h>
 %include <dali/public-api/object/any.h>
 
+%include <dali/public-api/common/dali-common.h>
 %include <dali/public-api/common/intrusive-ptr.h>
 
 %include <dali/public-api/math/vector2.h>
@@ -170,6 +176,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>
@@ -252,10 +259,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>;
@@ -277,13 +283,13 @@ typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair;
 %template(ImageSignal) Dali::Signal<void(Dali::Image)>;
 %template(RenderTaskSignal) Dali::Signal<void(Dali::RenderTask&)>;
 %template(LongPressGestureDetectedSignal) Dali::Signal<void (Dali::Actor, const Dali::LongPressGesture&)>;
-%template(ActorTouchEventSignal) Dali::Signal<bool (Dali::Actor, const Dali::TouchEvent&)>;
+//%template(ActorTouchEventSignal) Dali::Signal<bool (Dali::Actor, const Dali::TouchEvent&)>;
 %template(ActorTouchDataSignal) Dali::Signal<bool (Dali::Actor, const Dali::TouchData&)>;
 %template(ActorHoverEventSignal) Dali::Signal<bool (Dali::Actor, const Dali::HoverEvent&)>;
 %template(ActorWheelEventSignal) Dali::Signal<bool (Dali::Actor, const Dali::WheelEvent&)>;
 %template(ActorSignal) Dali::Signal<void (Dali::Actor)>;
 %template(KeyEventSignal) Dali::Signal<void (const Dali::KeyEvent&)>;
-%template(TouchEventSignal) Dali::Signal<void (const Dali::TouchEvent&)>;
+//%template(TouchEventSignal) Dali::Signal<void (const Dali::TouchEvent&)>;
 %template(TouchSignal) Dali::Signal<void (const Dali::TouchData&)>;
 %template(StageWheelEventSignal) Dali::Signal<void (const Dali::WheelEvent&)>;
 %template(AngleThresholdPair) std::pair<Dali::Radian, Dali::Radian>;