X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fdali-swig%2FSWIG%2Fdali-core.i;h=b59ff97c920fec8261a1eabf1e6bcbbc7a10121a;hb=4cd4cec306d85a0578977fa356e4d156ab7cc4a5;hp=29edf14ce1978bac4a6254642e966b7597f3347f;hpb=fea4c6c42a0b656781b5bfa1cafba3c3e9e24de8;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 29edf14..b59ff97 --- a/plugins/dali-swig/SWIG/dali-core.i +++ b/plugins/dali-swig/SWIG/dali-core.i @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -84,6 +84,8 @@ %ignore *::AnchorPoint::DEFAULT; %ignore *::SetPositionInheritanceMode(PositionInheritanceMode); %ignore *::GetKeyValue(SizeType) const; +%ignore *::TypeInfo::GetCreator() const; +%ignore Dali::Stage::TouchedSignal; %rename(ParentOriginTop) Dali::ParentOrigin::TOP; %rename(ParentOriginBottom) Dali::ParentOrigin::BOTTOM; @@ -147,6 +149,21 @@ %rename(BlendingEquationType) Dali::BlendingEquation::Type; %rename(CameraType) Dali::Camera::Type; %rename(LayerBehavior) Dali::Layer::Behavior; +%rename(X) Dali::Vector2::x; +%rename(Y) Dali::Vector2::y; +%rename(Width) Dali::Vector2::width; +%rename(Height) Dali::Vector2::height; +%rename(X) Dali::Vector3::x; +%rename(Y) Dali::Vector3::y; +%rename(Z) Dali::Vector3::z; +%rename(Width) Dali::Vector3::width; +%rename(Height) Dali::Vector3::height; +%rename(Depth) Dali::Vector3::depth; +%rename(X) Dali::Vector4::x; +%rename(Y) Dali::Vector4::y; +%rename(Z) Dali::Vector4::z; +%rename(W) Dali::Vector4::w; + typedef std::pair StringValuePair; typedef std::vector TouchPointContainer; @@ -171,6 +188,7 @@ typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair; %include %include %include +%include %include %include @@ -193,6 +211,9 @@ typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair; %include %include %include +%include +%include +%include %include %include @@ -241,7 +262,6 @@ typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair; %include %include %include -%include %include %include @@ -265,10 +285,8 @@ typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair; %template(StringValuePair) std::pair; %template(TouchPointContainer) std::vector; -%template(RectDouble) Dali::Rect; -%template(RectInteger) Dali::Rect; -%template(RectUnsignedInteger) Dali::Rect; -%template(RectFloat) Dali::Rect; +%template(Rectangle) Dali::Rect; +%template(PaddingType) Dali::Rect; %template(VectorInteger) Dali::Vector; %template(VectorFloat) Dali::Vector; %template(VectorUnsignedChar) Dali::Vector; @@ -282,15 +300,15 @@ typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair; %template(ImageSignal) Dali::Signal; %template(RenderTaskSignal) Dali::Signal; %template(LongPressGestureDetectedSignal) Dali::Signal; -%template(ActorTouchEventSignal) Dali::Signal; +//%template(ActorTouchEventSignal) Dali::Signal; %template(ActorTouchDataSignal) Dali::Signal; -%template(ActorHoverEventSignal) Dali::Signal; -%template(ActorWheelEventSignal) Dali::Signal; +%template(ActorHoverSignal) Dali::Signal; +%template(ActorWheelSignal) Dali::Signal; %template(ActorSignal) Dali::Signal; %template(KeyEventSignal) Dali::Signal; -%template(TouchEventSignal) Dali::Signal; +//%template(TouchEventSignal) Dali::Signal; %template(TouchSignal) Dali::Signal; -%template(StageWheelEventSignal) Dali::Signal; +%template(StageWheelSignal) Dali::Signal; %template(AngleThresholdPair) std::pair; %template(PanGestureDetectedSignal) Dali::Signal; %template(PinchGestureDetectedSignal) Dali::Signal;