From 2dda48bf44d1a7de83a35f2dbc93954ec836f0dc Mon Sep 17 00:00:00 2001 From: Feng Jin Date: Mon, 10 Apr 2017 19:15:07 +0800 Subject: [PATCH] Manual Merge for csahrp binder for v0.2.34 Change-Id: Ia22401dc5fafa21e6a171ab9d0d5da4686f0fae7 Signed-off-by: Feng Jin --- dali-csharp-binder/src/dali_wrap.cpp | 64 +++++++------------------- dali-csharp-binder/src/devel-property-wrap.cpp | 10 ++++ 2 files changed, 26 insertions(+), 48 deletions(-) diff --git a/dali-csharp-binder/src/dali_wrap.cpp b/dali-csharp-binder/src/dali_wrap.cpp index 7bf916e..5b5109b 100755 --- a/dali-csharp-binder/src/dali_wrap.cpp +++ b/dali-csharp-binder/src/dali_wrap.cpp @@ -1076,6 +1076,22 @@ SWIGINTERN void Dali_Signal_Sl_bool_Sp__SP__Sg__Disconnect(Dali::Signal< bool () SWIGINTERN bool Dali_Signal_Sl_bool_Sp__SP__Sg__Emit(Dali::Signal< bool () > *self){ return self->Emit(); } +SWIGINTERN bool Dali_Signal_Sl_void_Sp_bool_SP__Sg__Empty(Dali::Signal< void (bool) > const *self){ + return self->Empty(); + } +SWIGINTERN std::size_t Dali_Signal_Sl_void_Sp_bool_SP__Sg__GetConnectionCount(Dali::Signal< void (bool) > const *self){ + return self->GetConnectionCount(); + } +SWIGINTERN void Dali_Signal_Sl_void_Sp_bool_SP__Sg__Connect(Dali::Signal< void (bool) > *self,void (*func)(bool)){ + self->Connect( func ); + } +SWIGINTERN void Dali_Signal_Sl_void_Sp_bool_SP__Sg__Disconnect(Dali::Signal< void (bool) > *self,void (*func)(bool)){ + self->Disconnect( func ); + } +SWIGINTERN void Dali_Signal_Sl_void_Sp_bool_SP__Sg__Emit(Dali::Signal< void (bool) > *self,bool arg){ + /*@SWIG:SWIG/signals.i,185,NO_RETURN_FUNC@*/; +/*@SWIG@*/ self->Emit( arg ); + } SWIGINTERN std::vector< unsigned int > *new_std_vector_Sl_unsigned_SS_int_Sg___SWIG_2(int capacity){ std::vector< unsigned int >* pv = 0; if (capacity >= 0) { @@ -1675,26 +1691,6 @@ SWIGINTERN bool Dali_Signal_Sl_bool_Sp_Dali_Toolkit_Slider_Sc_int_SP__Sg__Emit(D } -//manual merge 2017-03-31 -SWIGINTERN bool Dali_Signal_Sl_void_Sp_bool_SP__Sg__Empty(Dali::Signal< void (bool) > const *self){ - return self->Empty(); - } -SWIGINTERN std::size_t Dali_Signal_Sl_void_Sp_bool_SP__Sg__GetConnectionCount(Dali::Signal< void (bool) > const *self){ - return self->GetConnectionCount(); - } -SWIGINTERN void Dali_Signal_Sl_void_Sp_bool_SP__Sg__Connect(Dali::Signal< void (bool) > *self,void (*func)(bool)){ - self->Connect( func ); - } -SWIGINTERN void Dali_Signal_Sl_void_Sp_bool_SP__Sg__Disconnect(Dali::Signal< void (bool) > *self,void (*func)(bool)){ - self->Disconnect( func ); - } -SWIGINTERN void Dali_Signal_Sl_void_Sp_bool_SP__Sg__Emit(Dali::Signal< void (bool) > *self,bool arg){ - /*@SWIG:SWIG/signals.i,185,NO_RETURN_FUNC@*/; -/*@SWIG@*/ self->Emit( arg ); - } - - - /* --------------------------------------------------- * C++ director class methods * --------------------------------------------------- */ @@ -53853,34 +53849,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetNativeHandle(void * jarg1) { } -SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_IndicatorVisibilityChangedSignal(void * jarg1) { - void * jresult ; - Dali::Window *arg1 = (Dali::Window *) 0 ; - Dali::Window::IndicatorSignalType *result = 0 ; - - arg1 = (Dali::Window *)jarg1; - { - try { - result = (Dali::Window::IndicatorSignalType *) &(arg1)->IndicatorVisibilityChangedSignal(); - } catch (std::out_of_range& e) { - { - SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; - }; - } catch (std::exception& e) { - { - SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return 0; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; - }; - } - } - jresult = (void *)result; - return jresult; -} - - SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FocusChangedSignal(void * jarg1) { void * jresult ; Dali::Window arg1 ; diff --git a/dali-csharp-binder/src/devel-property-wrap.cpp b/dali-csharp-binder/src/devel-property-wrap.cpp index a1d85dd..573139c 100755 --- a/dali-csharp-binder/src/devel-property-wrap.cpp +++ b/dali-csharp-binder/src/devel-property-wrap.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #ifdef __cplusplus extern "C" { @@ -231,6 +232,15 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Visual_Property_MIX_COLOR_get() { return jresult; } +SWIGEXPORT int SWIGSTDCALL CSharp_Image_Visual_BORDER_get() { + int jresult ; + int result; + + result = (int)Dali::Toolkit::DevelImageVisual::Property::BORDER; + jresult = (int)result; + return jresult; +} + #ifdef __cplusplus } #endif -- 2.7.4