X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=plugins%2Fdali-swig%2FSWIG%2Fevents%2Fslider-event.i;h=53906d606e78ed1fc62b63ca0b90047aac906fda;hp=8adf35e39747fca12c0b0c87c9465ace153a301d;hb=ed59234dddddba1caa4acecc638c0ad6b8a9150b;hpb=9d962edfc2200e02b0db2b00250e875805624918 diff --git a/plugins/dali-swig/SWIG/events/slider-event.i b/plugins/dali-swig/SWIG/events/slider-event.i index 8adf35e..53906d6 100644 --- a/plugins/dali-swig/SWIG/events/slider-event.i +++ b/plugins/dali-swig/SWIG/events/slider-event.i @@ -116,31 +116,23 @@ public class MarkReachedEventArgs : EventArgs } } - [UnmanagedFunctionPointer(CallingConvention.StdCall)] - public delegate bool ValueChangedEventHandler(object source, ValueChangedEventArgs e); - - [UnmanagedFunctionPointer(CallingConvention.StdCall)] - public delegate bool SlidingFinishedEventHandler(object source, SlidingFinishedEventArgs e); - - [UnmanagedFunctionPointer(CallingConvention.StdCall)] - public delegate bool MarkReachedEventHandler(object source, MarkReachedEventArgs e); [UnmanagedFunctionPointer(CallingConvention.StdCall)] private delegate bool ValueChangedCallbackDelegate(IntPtr slider, float slideValue); - private ValueChangedEventHandler _sliderValueChangedEventHandler; + private DaliEventHandlerWithReturnType _sliderValueChangedEventHandler; private ValueChangedCallbackDelegate _sliderValueChangedCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] private delegate bool SlidingFinishedCallbackDelegate(IntPtr slider, float slideValue); - private SlidingFinishedEventHandler _sliderSlidingFinishedEventHandler; + private DaliEventHandlerWithReturnType _sliderSlidingFinishedEventHandler; private SlidingFinishedCallbackDelegate _sliderSlidingFinishedCallbackDelegate; [UnmanagedFunctionPointer(CallingConvention.StdCall)] private delegate bool MarkReachedCallbackDelegate(IntPtr slider, int slideValue); - private MarkReachedEventHandler _sliderMarkReachedEventHandler; + private DaliEventHandlerWithReturnType _sliderMarkReachedEventHandler; private MarkReachedCallbackDelegate _sliderMarkReachedCallbackDelegate; - public event ValueChangedEventHandler ValueChanged + public event DaliEventHandlerWithReturnType ValueChanged { add { @@ -183,12 +175,12 @@ public class MarkReachedEventArgs : EventArgs if (_sliderValueChangedEventHandler != null) { //here we send all page to user event handlers - return _sliderValueChangedEventHandler(this, e); + return _sliderValueChangedEventHandler(this, e, true); } return false; } - public event SlidingFinishedEventHandler SlidingFinished + public event DaliEventHandlerWithReturnType SlidingFinished { add { @@ -231,12 +223,12 @@ public class MarkReachedEventArgs : EventArgs if (_sliderSlidingFinishedEventHandler != null) { //here we send all page to user event handlers - return _sliderSlidingFinishedEventHandler(this, e); + return _sliderSlidingFinishedEventHandler(this, e, true); } return false; } - public event MarkReachedEventHandler MarkReached + public event DaliEventHandlerWithReturnType MarkReached { add { @@ -279,7 +271,7 @@ public class MarkReachedEventArgs : EventArgs if (_sliderMarkReachedEventHandler != null) { //here we send all page to user event handlers - return _sliderMarkReachedEventHandler(this, e); + return _sliderMarkReachedEventHandler(this, e, true); } return false; }