From a2152d97038dbd8a1de0ee6181216acf94be1c8c Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Mon, 13 Mar 2017 16:17:45 +0900 Subject: [PATCH] dali-csharp-binder upgrade to 1.2.30 Change-Id: Ic15a8b67cc3a30147f3127167e04b405e4ed6638 Signed-off-by: dongsug.song --- dali-csharp-binder/src/dali_wrap.cpp | 779 ++++++++++++++-------- dali-csharp-binder/src/devel-property-wrap.cpp | 40 +- dali-csharp-binder/src/view-wrapper-impl-wrap.cpp | 198 ++---- dali-csharp-binder/src/view-wrapper-impl-wrap.h | 2 - 4 files changed, 589 insertions(+), 430 deletions(-) diff --git a/dali-csharp-binder/src/dali_wrap.cpp b/dali-csharp-binder/src/dali_wrap.cpp index b663ffb..f26ea2b 100644 --- a/dali-csharp-binder/src/dali_wrap.cpp +++ b/dali-csharp-binder/src/dali_wrap.cpp @@ -423,6 +423,8 @@ SWIGINTERN void SWIG_CSharpException(int code, const char *msg) { #include #include +#include + #include #include #include @@ -1057,6 +1059,21 @@ SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Application_SA__Sc_void_Sm__SP__Sg__ /*@SWIG:SWIG/signals.i,185,NO_RETURN_FUNC@*/; /*@SWIG@*/ self->Emit( arg1, arg2 ); } +SWIGINTERN bool Dali_Signal_Sl_bool_Sp__SP__Sg__Empty(Dali::Signal< bool () > const *self){ + return self->Empty(); + } +SWIGINTERN std::size_t Dali_Signal_Sl_bool_Sp__SP__Sg__GetConnectionCount(Dali::Signal< bool () > const *self){ + return self->GetConnectionCount(); + } +SWIGINTERN void Dali_Signal_Sl_bool_Sp__SP__Sg__Connect(Dali::Signal< bool () > *self,bool (*func)()){ + self->Connect( func ); + } +SWIGINTERN void Dali_Signal_Sl_bool_Sp__SP__Sg__Disconnect(Dali::Signal< bool () > *self,bool (*func)()){ + self->Disconnect( func ); + } +SWIGINTERN bool Dali_Signal_Sl_bool_Sp__SP__Sg__Emit(Dali::Signal< bool () > *self){ + return self->Emit(); + } 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) { @@ -1497,6 +1514,22 @@ SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Toolkit_PageTurnView_SP__Sg__Emit(Da /*@SWIG:SWIG/signals.i,185,NO_RETURN_FUNC@*/; /*@SWIG@*/ self->Emit( arg ); } +SWIGINTERN bool Dali_Signal_Sl_void_Sp_Dali_Toolkit_ProgressBar_Sc_float_Sc_float_SP__Sg__Empty(Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > const *self){ + return self->Empty(); + } +SWIGINTERN std::size_t Dali_Signal_Sl_void_Sp_Dali_Toolkit_ProgressBar_Sc_float_Sc_float_SP__Sg__GetConnectionCount(Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > const *self){ + return self->GetConnectionCount(); + } +SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Toolkit_ProgressBar_Sc_float_Sc_float_SP__Sg__Connect(Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *self,void (*func)(Dali::Toolkit::ProgressBar,float,float)){ + return self->Connect( func ); + } +SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Toolkit_ProgressBar_Sc_float_Sc_float_SP__Sg__Disconnect(Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *self,void (*func)(Dali::Toolkit::ProgressBar,float,float)){ + self->Disconnect( func ); + } +SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Toolkit_ProgressBar_Sc_float_Sc_float_SP__Sg__Emit(Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *self,Dali::Toolkit::ProgressBar arg1,float arg2,float arg3){ + /*@SWIG:SWIG/signals.i,185,NO_RETURN_FUNC@*/; +/*@SWIG@*/ self->Emit( arg1, arg2, arg3 ); + } SWIGINTERN bool Dali_Signal_Sl_void_Sp_Dali_Toolkit_ScrollView_SnapEvent_SS_const_SA__SP__Sg__Empty(Dali::Signal< void (Dali::Toolkit::ScrollView::SnapEvent const &) > const *self){ return self->Empty(); } @@ -21700,6 +21733,34 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Texture_GetHeight(void * jarg1) } +SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_Texture__SWIG_2(void * jarg1) { + void * jresult ; + Dali::Internal::Texture *arg1 = (Dali::Internal::Texture *) 0 ; + Dali::Texture *result = 0 ; + + arg1 = (Dali::Internal::Texture *)jarg1; + { + try { + result = (Dali::Texture *)new Dali::Texture(arg1); + } 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_Sampler_New() { void * jresult ; Dali::Sampler result; @@ -32048,6 +32109,202 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_UnparentAndReset(void * jarg1) { } +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Raise(void * jarg1) { + Dali::Actor arg1 ; + Dali::Actor *argp1 ; + + argp1 = (Dali::Actor *)jarg1; + if (!argp1) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0); + return ; + } + arg1 = *argp1; + { + try { + Dali::DevelActor::Raise(arg1); + } catch (std::out_of_range& e) { + { + SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; + }; + } catch (std::exception& e) { + { + SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return ; + }; + } catch (...) { + { + SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; + }; + } + } +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Lower(void * jarg1) { + Dali::Actor arg1 ; + Dali::Actor *argp1 ; + + argp1 = (Dali::Actor *)jarg1; + if (!argp1) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0); + return ; + } + arg1 = *argp1; + { + try { + Dali::DevelActor::Lower(arg1); + } catch (std::out_of_range& e) { + { + SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; + }; + } catch (std::exception& e) { + { + SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return ; + }; + } catch (...) { + { + SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; + }; + } + } +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RaiseToTop(void * jarg1) { + Dali::Actor arg1 ; + Dali::Actor *argp1 ; + + argp1 = (Dali::Actor *)jarg1; + if (!argp1) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0); + return ; + } + arg1 = *argp1; + { + try { + Dali::DevelActor::RaiseToTop(arg1); + } catch (std::out_of_range& e) { + { + SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; + }; + } catch (std::exception& e) { + { + SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return ; + }; + } catch (...) { + { + SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; + }; + } + } +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LowerToBottom(void * jarg1) { + Dali::Actor arg1 ; + Dali::Actor *argp1 ; + + argp1 = (Dali::Actor *)jarg1; + if (!argp1) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0); + return ; + } + arg1 = *argp1; + { + try { + Dali::DevelActor::LowerToBottom(arg1); + } catch (std::out_of_range& e) { + { + SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; + }; + } catch (std::exception& e) { + { + SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return ; + }; + } catch (...) { + { + SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; + }; + } + } +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_RaiseAbove(void * jarg1, void * jarg2) { + Dali::Actor arg1 ; + Dali::Actor arg2 ; + Dali::Actor *argp1 ; + Dali::Actor *argp2 ; + + argp1 = (Dali::Actor *)jarg1; + if (!argp1) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0); + return ; + } + arg1 = *argp1; + argp2 = (Dali::Actor *)jarg2; + if (!argp2) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0); + return ; + } + arg2 = *argp2; + { + try { + Dali::DevelActor::RaiseAbove(arg1,arg2); + } catch (std::out_of_range& e) { + { + SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; + }; + } catch (std::exception& e) { + { + SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return ; + }; + } catch (...) { + { + SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; + }; + } + } +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LowerBelow(void * jarg1, void * jarg2) { + Dali::Actor arg1 ; + Dali::Actor arg2 ; + Dali::Actor *argp1 ; + Dali::Actor *argp2 ; + + argp1 = (Dali::Actor *)jarg1; + if (!argp1) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0); + return ; + } + arg1 = *argp1; + argp2 = (Dali::Actor *)jarg2; + if (!argp2) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0); + return ; + } + arg2 = *argp2; + { + try { + Dali::DevelActor::LowerBelow(arg1,arg2); + } catch (std::out_of_range& e) { + { + SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; + }; + } catch (std::exception& e) { + { + SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return ; + }; + } catch (...) { + { + SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; + }; + } + } +} + + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Layer_Property_CLIPPING_ENABLE_get() { int jresult ; int result; @@ -48448,220 +48705,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_VoidSignal_Emit(void * jarg1) { } -SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_BoolSignal() { - void * jresult ; - Dali::Signal< bool () > *result = 0 ; - - { - try { - result = (Dali::Signal< bool () > *)new Dali::Signal< bool () >(); - } 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_delete_BoolSignal(void * jarg1) { - Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ; - - arg1 = (Dali::Signal< bool () > *)jarg1; - { - try { - delete arg1; - } catch (std::out_of_range& e) { - { - SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; - }; - } catch (std::exception& e) { - { - SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } -} - - -SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_BoolSignal_Empty(void * jarg1) { - unsigned int jresult ; - Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ; - bool result; - - arg1 = (Dali::Signal< bool () > *)jarg1; - { - try { - result = (bool)((Dali::Signal< bool () > const *)arg1)->Empty(); - } 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 = result; - return jresult; -} - - -SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_BoolSignal_GetConnectionCount(void * jarg1) { - unsigned long jresult ; - Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ; - std::size_t result; - - arg1 = (Dali::Signal< bool () > *)jarg1; - { - try { - result = ((Dali::Signal< bool () > const *)arg1)->GetConnectionCount(); - } 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 = (unsigned long)result; - return jresult; -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_BoolSignal_Connect__SWIG_0(void * jarg1, void * jarg2) { - Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ; - bool (*arg2)() = (bool (*)()) 0 ; - - arg1 = (Dali::Signal< bool () > *)jarg1; - arg2 = (bool (*)())jarg2; - { - try { - (arg1)->Connect(arg2); - } catch (std::out_of_range& e) { - { - SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; - }; - } catch (std::exception& e) { - { - SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_BoolSignal_Disconnect(void * jarg1, void * jarg2) { - Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ; - bool (*arg2)() = (bool (*)()) 0 ; - - arg1 = (Dali::Signal< bool () > *)jarg1; - arg2 = (bool (*)())jarg2; - { - try { - (arg1)->Disconnect(arg2); - } catch (std::out_of_range& e) { - { - SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; - }; - } catch (std::exception& e) { - { - SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_BoolSignal_Connect__SWIG_4(void * jarg1, void * jarg2, void * jarg3) { - Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ; - Dali::ConnectionTrackerInterface *arg2 = (Dali::ConnectionTrackerInterface *) 0 ; - Dali::FunctorDelegate *arg3 = (Dali::FunctorDelegate *) 0 ; - - arg1 = (Dali::Signal< bool () > *)jarg1; - arg2 = (Dali::ConnectionTrackerInterface *)jarg2; - arg3 = (Dali::FunctorDelegate *)jarg3; - { - try { - (arg1)->Connect(arg2,arg3); - } catch (std::out_of_range& e) { - { - SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; - }; - } catch (std::exception& e) { - { - SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } -} - - -SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_BoolSignal_Emit(void * jarg1) { - unsigned int jresult ; - Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ; - bool result; - - arg1 = (Dali::Signal< bool () > *)jarg1; - { - try { - result = (bool)(arg1)->Emit(); - } 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 = result; - return jresult; -} - - SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_FloatSignal_Empty(void * jarg1) { unsigned int jresult ; Dali::Signal< void (float) > *arg1 = (Dali::Signal< void (float) > *) 0 ; @@ -55108,56 +55151,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ApplicationControlSignal(void * j } -SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TimerSignalType() { - void * jresult ; - Dali::Signal< bool () > *result = 0 ; - - { - try { - result = (Dali::Signal< bool () > *)new Dali::Signal< bool () >(); - } 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_delete_TimerSignalType(void * jarg1) { - Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ; - - arg1 = (Dali::Signal< bool () > *)jarg1; - { - try { - delete arg1; - } catch (std::out_of_range& e) { - { - SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; - }; - } catch (std::exception& e) { - { - SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } -} - - SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TimerSignalType_Empty(void * jarg1) { unsigned int jresult ; Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ; @@ -55166,7 +55159,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TimerSignalType_Empty(void * jar arg1 = (Dali::Signal< bool () > *)jarg1; { try { - result = (bool)((Dali::Signal< bool () > const *)arg1)->Empty(); + result = (bool)Dali_Signal_Sl_bool_Sp__SP__Sg__Empty((Dali::Signal< bool () > const *)arg1); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -55194,7 +55187,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TimerSignalType_GetConnectionCo arg1 = (Dali::Signal< bool () > *)jarg1; { try { - result = ((Dali::Signal< bool () > const *)arg1)->GetConnectionCount(); + result = Dali_Signal_Sl_bool_Sp__SP__Sg__GetConnectionCount((Dali::Signal< bool () > const *)arg1); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -55214,7 +55207,7 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TimerSignalType_GetConnectionCo } -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TimerSignalType_Connect__SWIG_0(void * jarg1, void * jarg2) { +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TimerSignalType_Connect(void * jarg1, void * jarg2) { Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ; bool (*arg2)() = (bool (*)()) 0 ; @@ -55222,7 +55215,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TimerSignalType_Connect__SWIG_0(void * j arg2 = (bool (*)())jarg2; { try { - (arg1)->Connect(arg2); + Dali_Signal_Sl_bool_Sp__SP__Sg__Connect(arg1,arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; @@ -55248,7 +55241,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TimerSignalType_Disconnect(void * jarg1, arg2 = (bool (*)())jarg2; { try { - (arg1)->Disconnect(arg2); + Dali_Signal_Sl_bool_Sp__SP__Sg__Disconnect(arg1,arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; @@ -55266,43 +55259,41 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TimerSignalType_Disconnect(void * jarg1, } -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TimerSignalType_Connect__SWIG_4(void * jarg1, void * jarg2, void * jarg3) { +SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TimerSignalType_Emit(void * jarg1) { + unsigned int jresult ; Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ; - Dali::ConnectionTrackerInterface *arg2 = (Dali::ConnectionTrackerInterface *) 0 ; - Dali::FunctorDelegate *arg3 = (Dali::FunctorDelegate *) 0 ; + bool result; arg1 = (Dali::Signal< bool () > *)jarg1; - arg2 = (Dali::ConnectionTrackerInterface *)jarg2; - arg3 = (Dali::FunctorDelegate *)jarg3; { try { - (arg1)->Connect(arg2,arg3); + result = (bool)Dali_Signal_Sl_bool_Sp__SP__Sg__Emit(arg1); } catch (std::out_of_range& e) { { - SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; + SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; }; } catch (std::exception& e) { { - SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return ; + SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return 0; }; } catch (...) { { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; + SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; }; } } + jresult = result; + return jresult; } -SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TimerSignalType_Emit(void * jarg1) { - unsigned int jresult ; - Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ; - bool result; +SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TimerSignalType() { + void * jresult ; + Dali::Signal< bool () > *result = 0 ; - arg1 = (Dali::Signal< bool () > *)jarg1; { try { - result = (bool)(arg1)->Emit(); + result = (Dali::Signal< bool () > *)new Dali::Signal< bool () >(); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -55317,11 +55308,35 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_TimerSignalType_Emit(void * jarg }; } } - jresult = result; + jresult = (void *)result; return jresult; } +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TimerSignalType(void * jarg1) { + Dali::Signal< bool () > *arg1 = (Dali::Signal< bool () > *) 0 ; + + arg1 = (Dali::Signal< bool () > *)jarg1; + { + try { + delete arg1; + } catch (std::out_of_range& e) { + { + SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; + }; + } catch (std::exception& e) { + { + SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return ; + }; + } catch (...) { + { + SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; + }; + } + } +} + + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_VISUAL_PROPERTY_TYPE_get() { int jresult ; int result; @@ -89314,6 +89329,200 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_PagePanSignal(void * jarg1) { } +SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ProgressBarValueChangedSignal_Empty(void * jarg1) { + unsigned int jresult ; + Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *arg1 = (Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *) 0 ; + bool result; + + arg1 = (Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *)jarg1; + { + try { + result = (bool)Dali_Signal_Sl_void_Sp_Dali_Toolkit_ProgressBar_Sc_float_Sc_float_SP__Sg__Empty((Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > const *)arg1); + } 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 = result; + return jresult; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ProgressBarValueChangedSignal_GetConnectionCount(void * jarg1) { + unsigned long jresult ; + Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *arg1 = (Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *) 0 ; + std::size_t result; + + arg1 = (Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *)jarg1; + { + try { + result = Dali_Signal_Sl_void_Sp_Dali_Toolkit_ProgressBar_Sc_float_Sc_float_SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > const *)arg1); + } 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 = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ProgressBarValueChangedSignal_Connect(void * jarg1, void * jarg2) { + Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *arg1 = (Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *) 0 ; + void (*arg2)(Dali::Toolkit::ProgressBar,float,float) = (void (*)(Dali::Toolkit::ProgressBar,float,float)) 0 ; + + arg1 = (Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *)jarg1; + arg2 = (void (*)(Dali::Toolkit::ProgressBar,float,float))jarg2; + { + try { + Dali_Signal_Sl_void_Sp_Dali_Toolkit_ProgressBar_Sc_float_Sc_float_SP__Sg__Connect(arg1,arg2); + } catch (std::out_of_range& e) { + { + SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; + }; + } catch (std::exception& e) { + { + SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return ; + }; + } catch (...) { + { + SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; + }; + } + } +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ProgressBarValueChangedSignal_Disconnect(void * jarg1, void * jarg2) { + Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *arg1 = (Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *) 0 ; + void (*arg2)(Dali::Toolkit::ProgressBar,float,float) = (void (*)(Dali::Toolkit::ProgressBar,float,float)) 0 ; + + arg1 = (Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *)jarg1; + arg2 = (void (*)(Dali::Toolkit::ProgressBar,float,float))jarg2; + { + try { + Dali_Signal_Sl_void_Sp_Dali_Toolkit_ProgressBar_Sc_float_Sc_float_SP__Sg__Disconnect(arg1,arg2); + } catch (std::out_of_range& e) { + { + SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; + }; + } catch (std::exception& e) { + { + SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return ; + }; + } catch (...) { + { + SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; + }; + } + } +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ProgressBarValueChangedSignal_Emit(void * jarg1, void * jarg2, float jarg3, float jarg4) { + Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *arg1 = (Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *) 0 ; + Dali::Toolkit::ProgressBar arg2 ; + float arg3 ; + float arg4 ; + Dali::Toolkit::ProgressBar *argp2 ; + + arg1 = (Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *)jarg1; + argp2 = (Dali::Toolkit::ProgressBar *)jarg2; + if (!argp2) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Toolkit::ProgressBar", 0); + return ; + } + arg2 = *argp2; + arg3 = (float)jarg3; + arg4 = (float)jarg4; + { + try { + Dali_Signal_Sl_void_Sp_Dali_Toolkit_ProgressBar_Sc_float_Sc_float_SP__Sg__Emit(arg1,arg2,arg3,arg4); + } catch (std::out_of_range& e) { + { + SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; + }; + } catch (std::exception& e) { + { + SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return ; + }; + } catch (...) { + { + SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; + }; + } + } +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ProgressBarValueChangedSignal() { + void * jresult ; + Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *result = 0 ; + + { + try { + result = (Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *)new Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) >(); + } 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_delete_ProgressBarValueChangedSignal(void * jarg1) { + Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *arg1 = (Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *) 0 ; + + arg1 = (Dali::Signal< void (Dali::Toolkit::ProgressBar,float,float) > *)jarg1; + { + try { + delete arg1; + } catch (std::out_of_range& e) { + { + SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; + }; + } catch (std::exception& e) { + { + SWIG_CSharpException(SWIG_RuntimeError, const_cast(e.what())); return ; + }; + } catch (...) { + { + SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; + }; + } + } +} + + SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ScrollViewSnapStartedSignal_Empty(void * jarg1) { unsigned int jresult ; Dali::Signal< void (Dali::Toolkit::ScrollView::SnapEvent const &) > *arg1 = (Dali::Signal< void (Dali::Toolkit::ScrollView::SnapEvent const &) > *) 0 ; diff --git a/dali-csharp-binder/src/devel-property-wrap.cpp b/dali-csharp-binder/src/devel-property-wrap.cpp index 4e96f02..a1d85dd 100755 --- a/dali-csharp-binder/src/devel-property-wrap.cpp +++ b/dali-csharp-binder/src/devel-property-wrap.cpp @@ -34,21 +34,23 @@ extern "C" { #endif SWIGEXPORT int SWIGSTDCALL CSharp_Actor_Property_SIBLING_ORDER_get() { - int jresult ; - int result; - result = (int)Dali::DevelActor::Property::SIBLING_ORDER; - jresult = (int)result; - return jresult; + return Dali::DevelActor::Property::SIBLING_ORDER; } -SWIGEXPORT float SWIGSTDCALL CSharp_Actor_Property_OPACITY_get() { - int jresult ; - int result; +SWIGEXPORT int SWIGSTDCALL CSharp_Actor_Property_OPACITY_get() { - result = (float)Dali::DevelActor::Property::OPACITY; - jresult = (int)result; - return jresult; + return Dali::DevelActor::Property::OPACITY; +} + +SWIGEXPORT int SWIGSTDCALL CSharp_Actor_Property_SCREEN_POSITION_get() { + + return Dali::DevelActor::Property::SCREEN_POSITION; +} + +SWIGEXPORT int SWIGSTDCALL CSharp_Actor_Property_POSITION_USES_ANCHOR_POINT_get() { + + return Dali::DevelActor::Property::POSITION_USES_ANCHOR_POINT; } SWIGEXPORT int SWIGSTDCALL CSharp_View_Property_TOOLTIP_get() { @@ -78,6 +80,22 @@ SWIGEXPORT int SWIGSTDCALL CSharp_View_Property_SUB_STATE_get() { return jresult; } +SWIGEXPORT int SWIGSTDCALL CSharp_View_Property_LEFT_FOCUSABLE_ACTOR_ID_get() { + return Dali::Toolkit::DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID; +} + +SWIGEXPORT int SWIGSTDCALL CSharp_View_Property_RIGHT_FOCUSABLE_ACTOR_ID_get() { + return Dali::Toolkit::DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID; +} + +SWIGEXPORT int SWIGSTDCALL CSharp_View_Property_UP_FOCUSABLE_ACTOR_ID_get() { + return Dali::Toolkit::DevelControl::Property::UP_FOCUSABLE_ACTOR_ID; +} + +SWIGEXPORT int SWIGSTDCALL CSharp_View_Property_DOWN_FOCUSABLE_ACTOR_ID_get() { + return Dali::Toolkit::DevelControl::Property::DOWN_FOCUSABLE_ACTOR_ID; +} + SWIGEXPORT int SWIGSTDCALL CSharp_ItemView_Property_LAYOUT_get() { int jresult ; int result; diff --git a/dali-csharp-binder/src/view-wrapper-impl-wrap.cpp b/dali-csharp-binder/src/view-wrapper-impl-wrap.cpp index 9bf6950..d0d531a 100644 --- a/dali-csharp-binder/src/view-wrapper-impl-wrap.cpp +++ b/dali-csharp-binder/src/view-wrapper-impl-wrap.cpp @@ -35,24 +35,28 @@ SwigDirector_ViewWrapperImpl::~SwigDirector_ViewWrapperImpl() { void SwigDirector_ViewWrapperImpl::OnStageConnection(int depth) { - Dali::Toolkit::Internal::Control::OnStageConnection(depth); swig_callbackOnStageConnection(depth); + + Dali::Toolkit::Internal::Control::OnStageConnection(depth); } void SwigDirector_ViewWrapperImpl::OnStageDisconnection() { swig_callbackOnStageDisconnection(); + Dali::Toolkit::Internal::Control::OnStageDisconnection(); } void SwigDirector_ViewWrapperImpl::OnChildAdd(Dali::Actor &child) { - Dali::Toolkit::Internal::Control::OnChildAdd( child ); void * jchild = (Dali::Actor *) &child; swig_callbackOnChildAdd(jchild); + + Dali::Toolkit::Internal::Control::OnChildAdd( child ); } void SwigDirector_ViewWrapperImpl::OnChildRemove(Dali::Actor &child) { void * jchild = (Dali::Actor *) &child; swig_callbackOnChildRemove(jchild); + Dali::Toolkit::Internal::Control::OnChildRemove( child ); } @@ -60,24 +64,23 @@ void SwigDirector_ViewWrapperImpl::OnPropertySet(Dali::Property::Index index, Da int jindex ; void * jpropertyValue ; - if (!swig_callbackOnPropertySet) { - Dali::Toolkit::Internal::ControlWrapper::OnPropertySet(index,propertyValue); - return; - } else { - jindex = index; - jpropertyValue = (void *)new Dali::Property::Value((const Dali::Property::Value &)propertyValue); - swig_callbackOnPropertySet(jindex, jpropertyValue); - } + jindex = index; + jpropertyValue = (void *)new Dali::Property::Value((const Dali::Property::Value &)propertyValue); + swig_callbackOnPropertySet(jindex, jpropertyValue); + + Dali::Toolkit::Internal::ControlWrapper::OnPropertySet(index,propertyValue); } void SwigDirector_ViewWrapperImpl::OnSizeSet(Dali::Vector3 const &targetSize) { - Dali::Toolkit::Internal::Control::OnSizeSet(targetSize); swig_callbackOnSizeSet((Dali::Vector3 *) &targetSize); + + Dali::Toolkit::Internal::Control::OnSizeSet(targetSize); } void SwigDirector_ViewWrapperImpl::OnSizeAnimation(Dali::Animation &animation, Dali::Vector3 const &targetSize) { - Dali::Toolkit::Internal::Control::OnSizeAnimation(animation,targetSize); swig_callbackOnSizeAnimation(&animation, (Dali::Vector3 *) &targetSize); + + Dali::Toolkit::Internal::Control::OnSizeAnimation(animation,targetSize); } bool SwigDirector_ViewWrapperImpl::OnTouchEvent(Dali::TouchEvent const &event) { @@ -144,28 +147,22 @@ void SwigDirector_ViewWrapperImpl::OnRelayout(Dali::Vector2 const &size, Dali::R void * jsize = 0 ; void * jcontainer = 0 ; - if (!swig_callbackOnRelayout) { - Dali::Toolkit::Internal::Control::OnRelayout(size,container); - return; - } else { - jsize = (Dali::Vector2 *) &size; - jcontainer = (Dali::RelayoutContainer *) &container; - swig_callbackOnRelayout(jsize, jcontainer); - } + jsize = (Dali::Vector2 *) &size; + jcontainer = (Dali::RelayoutContainer *) &container; + swig_callbackOnRelayout(jsize, jcontainer); + + Dali::Toolkit::Internal::Control::OnRelayout(size,container); } void SwigDirector_ViewWrapperImpl::OnSetResizePolicy(Dali::ResizePolicy::Type policy, Dali::Dimension::Type dimension) { int jpolicy ; int jdimension ; - if (!swig_callbackOnSetResizePolicy) { - Dali::Toolkit::Internal::Control::OnSetResizePolicy(policy,dimension); - return; - } else { - jpolicy = (int)policy; - jdimension = (int)dimension; - swig_callbackOnSetResizePolicy(jpolicy, jdimension); - } + jpolicy = (int)policy; + jdimension = (int)dimension; + swig_callbackOnSetResizePolicy(jpolicy, jdimension); + + Dali::Toolkit::Internal::Control::OnSetResizePolicy(policy,dimension); } Dali::Vector3 SwigDirector_ViewWrapperImpl::GetNaturalSize() { @@ -250,45 +247,38 @@ bool SwigDirector_ViewWrapperImpl::RelayoutDependentOnChildren(Dali::Dimension:: void SwigDirector_ViewWrapperImpl::OnCalculateRelayoutSize(Dali::Dimension::Type dimension) { int jdimension ; - if (!swig_callbackOnCalculateRelayoutSize) { - Dali::Toolkit::Internal::Control::OnCalculateRelayoutSize(dimension); - return; - } else { - jdimension = (int)dimension; - swig_callbackOnCalculateRelayoutSize(jdimension); - } + jdimension = (int)dimension; + swig_callbackOnCalculateRelayoutSize(jdimension); + + Dali::Toolkit::Internal::Control::OnCalculateRelayoutSize(dimension); } void SwigDirector_ViewWrapperImpl::OnLayoutNegotiated(float size, Dali::Dimension::Type dimension) { float jsize ; int jdimension ; - if (!swig_callbackOnLayoutNegotiated) { - Dali::Toolkit::Internal::Control::OnLayoutNegotiated(size,dimension); - return; - } else { - jsize = size; - jdimension = (int)dimension; - swig_callbackOnLayoutNegotiated(jsize, jdimension); - } + jsize = size; + jdimension = (int)dimension; + swig_callbackOnLayoutNegotiated(jsize, jdimension); + + Dali::Toolkit::Internal::Control::OnLayoutNegotiated(size,dimension); } void SwigDirector_ViewWrapperImpl::OnInitialize() { - if (!swig_callbackOnInitialize) { - Dali::Toolkit::Internal::Control::OnInitialize(); - return; - } else { - swig_callbackOnInitialize(); - } + swig_callbackOnInitialize(); + + Dali::Toolkit::Internal::Control::OnInitialize(); } void SwigDirector_ViewWrapperImpl::OnControlChildAdd(Dali::Actor &child) { - Dali::Toolkit::Internal::Control::OnControlChildAdd(child); swig_callbackOnControlChildAdd(&child); + + Dali::Toolkit::Internal::Control::OnControlChildAdd(child); } void SwigDirector_ViewWrapperImpl::OnControlChildRemove(Dali::Actor &child) { swig_callbackOnControlChildRemove(&child); + Dali::Toolkit::Internal::Control::OnControlChildRemove(child); } @@ -296,14 +286,11 @@ void SwigDirector_ViewWrapperImpl::OnStyleChange(Dali::Toolkit::StyleManager sty void * jstyleManager ; int jchange ; - if (!swig_callbackOnStyleChange) { - Dali::Toolkit::Internal::Control::OnStyleChange(styleManager,change); - return; - } else { - jstyleManager = (void *)new Dali::Toolkit::StyleManager((const Dali::Toolkit::StyleManager &)styleManager); - jchange = (int)change; - swig_callbackOnStyleChange(jstyleManager, jchange); - } + jstyleManager = (void *)new Dali::Toolkit::StyleManager((const Dali::Toolkit::StyleManager &)styleManager); + jchange = (int)change; + swig_callbackOnStyleChange(jstyleManager, jchange); + + Dali::Toolkit::Internal::Control::OnStyleChange(styleManager,change); } bool SwigDirector_ViewWrapperImpl::OnAccessibilityActivated() { @@ -378,21 +365,15 @@ bool SwigDirector_ViewWrapperImpl::OnAccessibilityZoom() { } void SwigDirector_ViewWrapperImpl::OnKeyInputFocusGained() { - if (!swig_callbackOnKeyInputFocusGained) { - Dali::Toolkit::Internal::Control::OnKeyInputFocusGained(); - return; - } else { - swig_callbackOnKeyInputFocusGained(); - } + swig_callbackOnKeyInputFocusGained(); + + Dali::Toolkit::Internal::Control::OnKeyInputFocusGained(); } void SwigDirector_ViewWrapperImpl::OnKeyInputFocusLost() { - if (!swig_callbackOnKeyInputFocusLost) { - Dali::Toolkit::Internal::Control::OnKeyInputFocusLost(); - return; - } else { - swig_callbackOnKeyInputFocusLost(); - } + swig_callbackOnKeyInputFocusLost(); + + Dali::Toolkit::Internal::Control::OnKeyInputFocusLost(); } Dali::Actor SwigDirector_ViewWrapperImpl::GetNextKeyboardFocusableActor(Dali::Actor currentFocusedActor, Dali::Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled) { @@ -420,14 +401,10 @@ Dali::Actor SwigDirector_ViewWrapperImpl::GetNextKeyboardFocusableActor(Dali::Ac void SwigDirector_ViewWrapperImpl::OnKeyboardFocusChangeCommitted(Dali::Actor commitedFocusableActor) { void * jcommitedFocusableActor ; + jcommitedFocusableActor = (void *)new Dali::Actor((const Dali::Actor &)commitedFocusableActor); + swig_callbackOnKeyboardFocusChangeCommitted(jcommitedFocusableActor); - if (!swig_callbackOnKeyboardFocusChangeCommitted) { - Dali::Toolkit::Internal::Control::OnKeyboardFocusChangeCommitted(commitedFocusableActor); - return; - } else { - jcommitedFocusableActor = (void *)new Dali::Actor((const Dali::Actor &)commitedFocusableActor); - swig_callbackOnKeyboardFocusChangeCommitted(jcommitedFocusableActor); - } + Dali::Toolkit::Internal::Control::OnKeyboardFocusChangeCommitted(commitedFocusableActor); } bool SwigDirector_ViewWrapperImpl::OnKeyboardEnter() { @@ -445,78 +422,35 @@ bool SwigDirector_ViewWrapperImpl::OnKeyboardEnter() { void SwigDirector_ViewWrapperImpl::OnPinch(Dali::PinchGesture const &pinch) { void * jpinch = 0 ; + jpinch = (Dali::PinchGesture *) &pinch; + swig_callbackOnPinch(jpinch); - if (!swig_callbackOnPinch) { - Dali::Toolkit::Internal::Control::OnPinch(pinch); - return; - } else { - jpinch = (Dali::PinchGesture *) &pinch; - swig_callbackOnPinch(jpinch); - } + Dali::Toolkit::Internal::Control::OnPinch(pinch); } void SwigDirector_ViewWrapperImpl::OnPan(Dali::PanGesture const &pan) { void * jpan = 0 ; + jpan = (Dali::PanGesture *) &pan; + swig_callbackOnPan(jpan); - if (!swig_callbackOnPan) { - Dali::Toolkit::Internal::Control::OnPan(pan); - return; - } else { - jpan = (Dali::PanGesture *) &pan; - swig_callbackOnPan(jpan); - } + Dali::Toolkit::Internal::Control::OnPan(pan); } void SwigDirector_ViewWrapperImpl::OnTap(Dali::TapGesture const &tap) { void * jtap = 0 ; + jtap = (Dali::TapGesture *) &tap; + swig_callbackOnTap(jtap); - if (!swig_callbackOnTap) { - Dali::Toolkit::Internal::Control::OnTap(tap); - return; - } else { - jtap = (Dali::TapGesture *) &tap; - swig_callbackOnTap(jtap); - } + Dali::Toolkit::Internal::Control::OnTap(tap); } void SwigDirector_ViewWrapperImpl::OnLongPress(Dali::LongPressGesture const &longPress) { void * jlongPress = 0 ; - if (!swig_callbackOnLongPress) { - Dali::Toolkit::Internal::Control::OnLongPress(longPress); - return; - } else { - jlongPress = (Dali::LongPressGesture *) &longPress; - swig_callbackOnLongPress(jlongPress); - } -} - -void SwigDirector_ViewWrapperImpl::SignalConnected(Dali::SlotObserver *slotObserver, Dali::CallbackBase *callback) { - void * jslotObserver = 0 ; - void * jcallback = 0 ; - - if (!swig_callbackSignalConnected) { - Dali::Toolkit::Internal::Control::SignalConnected(slotObserver,callback); - return; - } else { - jslotObserver = (void *) slotObserver; - jcallback = (void *) callback; - swig_callbackSignalConnected(jslotObserver, jcallback); - } -} - -void SwigDirector_ViewWrapperImpl::SignalDisconnected(Dali::SlotObserver *slotObserver, Dali::CallbackBase *callback) { - void * jslotObserver = 0 ; - void * jcallback = 0 ; + jlongPress = (Dali::LongPressGesture *) &longPress; + swig_callbackOnLongPress(jlongPress); - if (!swig_callbackSignalDisconnected) { - Dali::Toolkit::Internal::Control::SignalDisconnected(slotObserver,callback); - return; - } else { - jslotObserver = (void *) slotObserver; - jcallback = (void *) callback; - swig_callbackSignalDisconnected(jslotObserver, jcallback); - } + Dali::Toolkit::Internal::Control::OnLongPress(longPress); } Dali::Toolkit::Internal::Control::Extension *SwigDirector_ViewWrapperImpl::GetControlExtension() { diff --git a/dali-csharp-binder/src/view-wrapper-impl-wrap.h b/dali-csharp-binder/src/view-wrapper-impl-wrap.h index f95d74a..9b5a8be 100644 --- a/dali-csharp-binder/src/view-wrapper-impl-wrap.h +++ b/dali-csharp-binder/src/view-wrapper-impl-wrap.h @@ -140,8 +140,6 @@ public: virtual void OnPan(Dali::PanGesture const &pan); virtual void OnTap(Dali::TapGesture const &tap); virtual void OnLongPress(Dali::LongPressGesture const &longPress); - virtual void SignalConnected(Dali::SlotObserver *slotObserver, Dali::CallbackBase *callback); - virtual void SignalDisconnected(Dali::SlotObserver *slotObserver, Dali::CallbackBase *callback); virtual Dali::Toolkit::Internal::Control::Extension *GetControlExtension(); typedef void (SWIGSTDCALL* SWIG_Callback0_t)(int); -- 2.7.4