X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fdali-swig%2FSWIG%2Fdali-core.i;h=5535ee9666eb4175ea38ae7fe7eee01882be4418;hb=e54f982e0aaf23db4c3002a3d9fe47a19737bb71;hp=29edf14ce1978bac4a6254642e966b7597f3347f;hpb=caf7677175a0e8b9c690d4f2ab73adc295f22c0e;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..5535ee9 --- a/plugins/dali-swig/SWIG/dali-core.i +++ b/plugins/dali-swig/SWIG/dali-core.i @@ -147,6 +147,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; @@ -193,6 +208,7 @@ typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair; %include %include %include +%include %include %include @@ -282,13 +298,13 @@ 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(ActorSignal) Dali::Signal; %template(KeyEventSignal) Dali::Signal; -%template(TouchEventSignal) Dali::Signal; +//%template(TouchEventSignal) Dali::Signal; %template(TouchSignal) Dali::Signal; %template(StageWheelEventSignal) Dali::Signal; %template(AngleThresholdPair) std::pair;