From: adam.b Date: Fri, 11 Sep 2020 11:57:48 +0000 (+0100) Subject: [dali_1.9.29] Merge branch 'devel/master' X-Git-Tag: dali_2.0.3~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=85955d3b0a0ca7393da6678853f9a4349927e4a8;hp=17f419df6623e6eaeb0f96d976edfc2e5c8ee0e8;p=platform%2Fcore%2Fuifw%2Fdali-csharp-binder.git [dali_1.9.29] Merge branch 'devel/master' Change-Id: I065dbbaa775ca3b8280cd64dfd5573b06ee2858a --- diff --git a/dali-csharp-binder/src/adaptor.cpp b/dali-csharp-binder/src/adaptor.cpp index 8d086ba..a201565 100755 --- a/dali-csharp-binder/src/adaptor.cpp +++ b/dali-csharp-binder/src/adaptor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -45,89 +45,6 @@ extern "C" { #endif -SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Adaptor_New__SWIG_0(void * jarg1) { - void * jresult ; - Dali::Window arg1 ; - Dali::Window *argp1 ; - Dali::Adaptor *result = 0 ; - - argp1 = (Dali::Window *)jarg1; - if (!argp1) { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window", 0); - return 0; - } - arg1 = *argp1; - { - try { - result = (Dali::Adaptor *) &Dali::Adaptor::New(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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; - }; - } - } - - jresult = (void *)result; - return jresult; -} - -SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Adaptor_New__SWIG_2(void * jarg1, void * jarg2) { - void * jresult ; - Dali::Window arg1 ; - Dali::Window *argp1 ; - Dali::RenderSurfaceInterface *arg2 = 0 ; - Dali::Adaptor *result = 0 ; - - argp1 = (Dali::Window *)jarg1; - if (!argp1) { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window", 0); - return 0; - } - arg1 = *argp1; - arg2 = (Dali::RenderSurfaceInterface *)jarg2; - if (!arg2) { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::RenderSurface const & type is null", 0); - return 0; - } - { - try { - result = (Dali::Adaptor *) &Dali::Adaptor::New(arg1,(Dali::RenderSurfaceInterface const &)*arg2); - } 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; - }; - } - } - - jresult = (void *)result; - return jresult; -} - - SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Adaptor(void * jarg1) { Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; @@ -157,100 +74,15 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_Adaptor(void * jarg1) { } -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_Start(void * jarg1) { - Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - - arg1 = (Dali::Adaptor *)jarg1; - { - try { - (arg1)->Start(); - } 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } - -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_Pause(void * jarg1) { - Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - - arg1 = (Dali::Adaptor *)jarg1; - { - try { - (arg1)->Pause(); - } 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } - -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_Resume(void * jarg1) { - Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - - arg1 = (Dali::Adaptor *)jarg1; - { - try { - (arg1)->Resume(); - } 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } - -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_Stop(void * jarg1) { +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_SetRenderRefreshRate(void * jarg1, unsigned int jarg2) { Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; + unsigned int arg2 ; arg1 = (Dali::Adaptor *)jarg1; + arg2 = (unsigned int)jarg2; { try { - (arg1)->Stop(); + (arg1)->SetRenderRefreshRate(arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; @@ -273,17 +105,13 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_Stop(void * jarg1) { } -SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Adaptor_AddIdle(void * jarg1, void * jarg2) { - unsigned int jresult ; - Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - Dali::CallbackBase *arg2 = (Dali::CallbackBase *) 0 ; - bool result; +SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Adaptor_Get() { + void * jresult ; + Dali::Adaptor *result = 0 ; - arg1 = (Dali::Adaptor *)jarg1; - arg2 = (Dali::CallbackBase *)jarg2; { try { - result = (bool)(arg1)->AddIdle(arg2, false); + result = (Dali::Adaptor *) &Dali::Adaptor::Get(); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -303,63 +131,24 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Adaptor_AddIdle(void * jarg1, vo } } - jresult = result; + jresult = (void *)result; return jresult; } -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_RemoveIdle(void * jarg1, void * jarg2) { - Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - Dali::CallbackBase *arg2 = (Dali::CallbackBase *) 0 ; - - arg1 = (Dali::Adaptor *)jarg1; - arg2 = (Dali::CallbackBase *)jarg2; - { - try { - (arg1)->RemoveIdle(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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } - -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_ReplaceSurface(void * jarg1, void * jarg2, void * jarg3) { +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_FeedWheelEvent(void * jarg1, void * jarg2) { Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - Dali::Window arg2 ; - Dali::Window *argp2 ; - Dali::RenderSurfaceInterface *arg3 = 0 ; + Dali::WheelEvent *arg2 = 0 ; arg1 = (Dali::Adaptor *)jarg1; - argp2 = (Dali::Window *)jarg2; - if (!argp2) { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window", 0); - return ; - } - arg2 = *argp2; - arg3 = (Dali::RenderSurfaceInterface *)jarg3; - if (!arg3) { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::RenderSurface & type is null", 0); + arg2 = (Dali::WheelEvent *)jarg2; + if (!arg2) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::WheelEvent & type is null", 0); return ; } { try { - (arg1)->ReplaceSurface(arg2, *arg3); + (arg1)->FeedWheelEvent(*arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; @@ -382,333 +171,15 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_ReplaceSurface(void * jarg1, voi } -SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Adaptor_GetSurface(void * jarg1) { - void * jresult ; - Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - Dali::RenderSurfaceInterface *result = 0 ; - - arg1 = (Dali::Adaptor *)jarg1; - { - try { - result = (Dali::RenderSurfaceInterface *) &(arg1)->GetSurface(); - } 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; - }; - } - } - - jresult = (void *)result; - return jresult; -} - - -SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Adaptor_GetNativeWindowHandle(void * jarg1) { - void * jresult ; +SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_FeedKeyEvent(void * jarg1, void * jarg2) { Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - Dali::Any result; + Dali::KeyEvent *arg2 = 0 ; arg1 = (Dali::Adaptor *)jarg1; - { - try { - result = (arg1)->GetNativeWindowHandle(); - } 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; - }; - } - } - - jresult = new Dali::Any((const Dali::Any &)result); - return jresult; -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_ReleaseSurfaceLock(void * jarg1) { - Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - - arg1 = (Dali::Adaptor *)jarg1; - { - try { - (arg1)->ReleaseSurfaceLock(); - } 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } - -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_SetRenderRefreshRate(void * jarg1, unsigned int jarg2) { - Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - unsigned int arg2 ; - - arg1 = (Dali::Adaptor *)jarg1; - arg2 = (unsigned int)jarg2; - { - try { - (arg1)->SetRenderRefreshRate(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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } - -} - - -SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Adaptor_Get() { - void * jresult ; - Dali::Adaptor *result = 0 ; - - { - try { - result = (Dali::Adaptor *) &Dali::Adaptor::Get(); - } 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; - }; - } - } - - jresult = (void *)result; - return jresult; -} - - -SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Adaptor_IsAvailable() { - unsigned int jresult ; - bool result; - - { - try { - result = (bool)Dali::Adaptor::IsAvailable(); - } 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; - }; - } - } - - jresult = result; - return jresult; -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_NotifySceneCreated(void * jarg1) { - Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - - arg1 = (Dali::Adaptor *)jarg1; - { - try { - (arg1)->NotifySceneCreated(); - } 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } - -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_NotifyLanguageChanged(void * jarg1) { - Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - - arg1 = (Dali::Adaptor *)jarg1; - { - try { - (arg1)->NotifyLanguageChanged(); - } 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } - -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_FeedTouchPoint(void * jarg1, void * jarg2, int jarg3) { - Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - Dali::TouchPoint *arg2 = 0 ; - int arg3 ; - - arg1 = (Dali::Adaptor *)jarg1; - arg2 = (Dali::TouchPoint *)jarg2; - if (!arg2) { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TouchPoint & type is null", 0); - return ; - } - arg3 = (int)jarg3; - { - try { - (arg1)->FeedTouchPoint(*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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } - -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_FeedWheelEvent(void * jarg1, void * jarg2) { - Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - Dali::WheelEvent *arg2 = 0 ; - - arg1 = (Dali::Adaptor *)jarg1; - arg2 = (Dali::WheelEvent *)jarg2; - if (!arg2) { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::WheelEvent & type is null", 0); - return ; - } - { - try { - (arg1)->FeedWheelEvent(*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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } - -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_FeedKeyEvent(void * jarg1, void * jarg2) { - Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - Dali::KeyEvent *arg2 = 0 ; - - arg1 = (Dali::Adaptor *)jarg1; - arg2 = (Dali::KeyEvent *)jarg2; - if (!arg2) { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::KeyEvent & type is null", 0); - return ; + arg2 = (Dali::KeyEvent *)jarg2; + if (!arg2) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::KeyEvent & type is null", 0); + return ; } { try { @@ -735,323 +206,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_FeedKeyEvent(void * jarg1, void } -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_SceneCreated(void * jarg1) { - Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - - arg1 = (Dali::Adaptor *)jarg1; - { - try { - (arg1)->SceneCreated(); - } 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } - -} - -SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Adaptor_ResizedSignal(void * jarg1) { - void * jresult ; - Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - Dali::Adaptor::AdaptorSignalType *result = 0 ; - - arg1 = (Dali::Adaptor *)jarg1; - { - try { - result = (Dali::Adaptor::AdaptorSignalType *) &(arg1)->ResizedSignal(); - } 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; - }; - } - } - - jresult = (void *)result; - return jresult; -} - - -SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Adaptor_LanguageChangedSignal(void * jarg1) { - void * jresult ; - Dali::Adaptor *arg1 = (Dali::Adaptor *) 0 ; - Dali::Adaptor::AdaptorSignalType *result = 0 ; - - arg1 = (Dali::Adaptor *)jarg1; - { - try { - result = (Dali::Adaptor::AdaptorSignalType *) &(arg1)->LanguageChangedSignal(); - } 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; - }; - } - } - - jresult = (void *)result; - return jresult; -} - - -SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AdaptorSignalType_Empty(void * jarg1) { - unsigned int jresult ; - Dali::Signal< void (Dali::Adaptor &) > *arg1 = (Dali::Signal< void (Dali::Adaptor &) > *) 0 ; - bool result; - - arg1 = (Dali::Signal< void (Dali::Adaptor &) > *)jarg1; - { - try { - result = (bool)Dali_Signal_Sl_void_Sp_Dali_Adaptor_SA__SP__Sg__Empty((Dali::Signal< void (Dali::Adaptor &) > 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; - }; - } - } - - jresult = result; - return jresult; -} - - -SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_AdaptorSignalType_GetConnectionCount(void * jarg1) { - unsigned long jresult ; - Dali::Signal< void (Dali::Adaptor &) > *arg1 = (Dali::Signal< void (Dali::Adaptor &) > *) 0 ; - std::size_t result; - - arg1 = (Dali::Signal< void (Dali::Adaptor &) > *)jarg1; - { - try { - result = Dali_Signal_Sl_void_Sp_Dali_Adaptor_SA__SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::Adaptor &) > 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; - }; - } - } - - jresult = (unsigned long)result; - return jresult; -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AdaptorSignalType_Connect(void * jarg1, void * jarg2) { - Dali::Signal< void (Dali::Adaptor &) > *arg1 = (Dali::Signal< void (Dali::Adaptor &) > *) 0 ; - void (*arg2)(Dali::Adaptor &) = (void (*)(Dali::Adaptor &)) 0 ; - - arg1 = (Dali::Signal< void (Dali::Adaptor &) > *)jarg1; - arg2 = (void (*)(Dali::Adaptor &))jarg2; - { - try { - Dali_Signal_Sl_void_Sp_Dali_Adaptor_SA__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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } - -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AdaptorSignalType_Disconnect(void * jarg1, void * jarg2) { - Dali::Signal< void (Dali::Adaptor &) > *arg1 = (Dali::Signal< void (Dali::Adaptor &) > *) 0 ; - void (*arg2)(Dali::Adaptor &) = (void (*)(Dali::Adaptor &)) 0 ; - - arg1 = (Dali::Signal< void (Dali::Adaptor &) > *)jarg1; - arg2 = (void (*)(Dali::Adaptor &))jarg2; - { - try { - Dali_Signal_Sl_void_Sp_Dali_Adaptor_SA__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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } - -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_AdaptorSignalType_Emit(void * jarg1, void * jarg2) { - Dali::Signal< void (Dali::Adaptor &) > *arg1 = (Dali::Signal< void (Dali::Adaptor &) > *) 0 ; - Dali::Adaptor *arg2 = 0 ; - - arg1 = (Dali::Signal< void (Dali::Adaptor &) > *)jarg1; - arg2 = (Dali::Adaptor *)jarg2; - if (!arg2) { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Adaptor & type is null", 0); - return ; - } - { - try { - Dali_Signal_Sl_void_Sp_Dali_Adaptor_SA__SP__Sg__Emit(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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } - -} - - -SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_AdaptorSignalType() { - void * jresult ; - Dali::Signal< void (Dali::Adaptor &) > *result = 0 ; - - { - try { - result = (Dali::Signal< void (Dali::Adaptor &) > *)new Dali::Signal< void (Dali::Adaptor &) >(); - } 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; - }; - } - } - - jresult = (void *)result; - return jresult; -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_AdaptorSignalType(void * jarg1) { - Dali::Signal< void (Dali::Adaptor &) > *arg1 = (Dali::Signal< void (Dali::Adaptor &) > *) 0 ; - - arg1 = (Dali::Signal< void (Dali::Adaptor &) > *)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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return ; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ; - }; - } - } - -} - - #ifdef __cplusplus } #endif diff --git a/dali-csharp-binder/src/dali_wrap.cpp b/dali-csharp-binder/src/dali_wrap.cpp old mode 100644 new mode 100755 index 036d515..112f8e8 --- a/dali-csharp-binder/src/dali_wrap.cpp +++ b/dali-csharp-binder/src/dali_wrap.cpp @@ -429,6 +429,10 @@ void SWIG_CSharpException(int code, const char *msg) { #include #include #include +#include +#include +#include +#include #include #include @@ -19533,6 +19537,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_keyPressedName_set(void * jarg1, cha Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0 ; std::string *arg2 = 0 ; + argp1 = (Dali::KeyEvent *) jarg1; + if (!argp1) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0); + return ; + } + Dali::KeyEvent arg1 = *argp1; if (!jarg2) { SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0); @@ -19612,6 +19622,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_keyPressed_set(void * jarg1, char * Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0 ; std::string *arg2 = 0 ; + argp1 = (Dali::KeyEvent *) jarg1; + if (!argp1) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0); + return ; + } + Dali::KeyEvent arg1 = *argp1; if (!jarg2) { SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0); @@ -19684,6 +19700,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_keyCode_set(void * jarg1, int jarg2) Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0 ; int arg2 ; + argp1 = (Dali::KeyEvent *) jarg1; + if (!argp1) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0); + return ; + } + Dali::KeyEvent arg1 = *argp1; arg2 = (int)jarg2; { @@ -19747,6 +19769,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_keyModifier_set(void * jarg1, int ja Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0 ; int arg2 ; + argp1 = (Dali::KeyEvent *) jarg1; + if (!argp1) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0); + return ; + } + Dali::KeyEvent arg1 = *argp1; arg2 = (int)jarg2; { @@ -19810,6 +19838,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_time_set(void * jarg1, unsigned long Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0 ; unsigned long arg2 ; + argp1 = (Dali::KeyEvent *) jarg1; + if (!argp1) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0); + return ; + } + Dali::KeyEvent arg1 = *argp1; arg2 = (int)jarg2; { @@ -19873,6 +19907,12 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Key_state_set(void * jarg1, int jarg2) { Dali::KeyEvent *argp1 = (Dali::KeyEvent *) 0; Dali::KeyEvent::State arg2; + argp1 = (Dali::KeyEvent *) jarg1; + if (!argp1) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "KeyEvent is null", 0); + return ; + } + Dali::KeyEvent arg1 = *argp1; arg2 = (Dali::KeyEvent::State)jarg2; { @@ -20196,6 +20236,23 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LongPressGesture__SWIG_0() { } +SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LongPressGesture_New(int jarg1) { + void * jresult ; + Dali::GestureState arg1 ; + Dali::LongPressGesture result; + + arg1 = (Dali::GestureState)jarg1; + { + try { + result = DevelLongPressGesture::New(arg1); + } CALL_CATCH_EXCEPTION(0); + } + + jresult = new Dali::LongPressGesture((const Dali::LongPressGesture &)result); + return jresult; +} + + SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LongPressGesture__SWIG_1(void * jarg1) { void * jresult ; Dali::LongPressGesture *arg1 = 0 ; @@ -25332,36 +25389,20 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGesture__SWIG_0() { return jresult; } -// Need to delete this -SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PanGesture__SWIG_1(int jarg1) { + +SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PanGesture_New(int jarg1) { void * jresult ; Dali::GestureState arg1 ; - Dali::PanGesture *result = 0 ; + Dali::PanGesture result; arg1 = (Dali::GestureState)jarg1; { try { - result = (Dali::PanGesture *)new Dali::PanGesture(); - } 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 (Dali::DaliException e) { - { - SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0; - }; - } catch (...) { - { - SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; - }; - } + result = DevelPanGesture::New(arg1); + } CALL_CATCH_EXCEPTION(0); } - jresult = (void *)result; + jresult = new Dali::PanGesture((const Dali::PanGesture &)result); return jresult; } @@ -25836,6 +25877,23 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PinchGesture__SWIG_0() { } +SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PinchGesture_New(int jarg1) { + void * jresult ; + Dali::GestureState arg1 ; + Dali::PinchGesture result; + + arg1 = (Dali::GestureState)jarg1; + { + try { + result = DevelPinchGesture::New(arg1); + } CALL_CATCH_EXCEPTION(0); + } + + jresult = new Dali::PinchGesture((const Dali::PinchGesture &)result); + return jresult; +} + + SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PinchGesture__SWIG_1(void * jarg1) { void * jresult ; Dali::PinchGesture *arg1 = 0 ; @@ -26204,6 +26262,23 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TapGesture__SWIG_0() { } +SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TapGesture_New(int jarg1) { + void * jresult ; + Dali::GestureState arg1 ; + Dali::TapGesture result; + + arg1 = (Dali::GestureState)jarg1; + { + try { + result = DevelTapGesture::New(arg1); + } CALL_CATCH_EXCEPTION(0); + } + + jresult = new Dali::TapGesture((const Dali::TapGesture &)result); + return jresult; +} + + SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TapGesture__SWIG_1(void * jarg1) { void * jresult ; Dali::TapGesture *arg1 = 0 ; @@ -33130,15 +33205,15 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ViewLayoutDirectionSignal(void * } -SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_iewVisibilityChangedSignal_Empty(void * jarg1) { +SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ViewVisibilityChangedSignal_Empty(void * jarg1) { unsigned int jresult ; Dali::Signal< void (Dali::Actor,bool,Dali::DevelActor::VisibilityChange::Type) > *arg1 = (Dali::Signal< void (Dali::Actor,bool,Dali::DevelActor::VisibilityChange::Type) > *) 0 ; bool result = false; - - arg1 = (Dali::Signal< void (Dali::Actor,bool,Dali::DevelActor::VisibilityChange::Type) > *)jarg1; + + arg1 = (Dali::Signal< void (Dali::Actor,bool,Dali::DevelActor::VisibilityChange::Type) > *)jarg1; { try { - result = (bool)Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_bool_Sc_Dali_DevelActor_VisibilityChange_Type_SP__Sg__Empty((Dali::Signal< void (Dali::Actor,bool,Dali::DevelActor::VisibilityChange::Type) > const *)arg1); + result = (bool)Dali_Signal_Sl_void_Sp_Dali_Actor_Sc_bool_Sc_Dali_DevelActor_VisibilityChange_Type_SP__Sg__Empty((Dali::Signal< void (Dali::Actor,bool,Dali::DevelActor::VisibilityChange::Type) > const *)arg1); } CALL_CATCH_EXCEPTION(0); } jresult = result; @@ -56234,6 +56309,10 @@ SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Key_SWIGUpcast(Dali::KeyEv return (Dali::BaseHandle *)jarg1; } +SWIGEXPORT Dali::BaseHandle * SWIGSTDCALL CSharp_Dali_Gesture_SWIGUpcast(Dali::Gesture *jarg1) { + return (Dali::BaseHandle *)jarg1; +} + SWIGEXPORT Dali::Handle * SWIGSTDCALL CSharp_Dali_GestureDetector_SWIGUpcast(Dali::GestureDetector *jarg1) { return (Dali::Handle *)jarg1; } @@ -56491,7 +56570,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Widget_New__SWIG_0() { result = Dali::Widget::New(); } CALL_CATCH_EXCEPTION(0); } - + jresult = new Dali::Widget((const Dali::Widget &)result); return jresult; } @@ -57205,11 +57284,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PixelBuffer_Convert(void * jarg1) { try { result = Dali::Devel::PixelBuffer::Convert(*arg1); } CALL_CATCH_EXCEPTION(0); - } + } jresult = new Dali::PixelData((const Dali::PixelData &)result); return jresult; } - + SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_PixelBuffer_CreatePixelData(void * jarg1) { void * jresult ; @@ -57448,7 +57527,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LoadImageFromFile__SWIG_0(char * jarg1 try { result = Dali::LoadImageFromFile((std::string const &)*arg1,arg2,arg3,arg4,arg5); } CALL_CATCH_EXCEPTION(0); - } + } jresult = new Dali::Devel::PixelBuffer((const Dali::Devel::PixelBuffer &)result); return jresult; } @@ -57599,7 +57678,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GetClosestImageSize__SWIG_0(char * jar } CALL_CATCH_EXCEPTION(0); } jresult = new Dali::ImageDimensions((const Dali::ImageDimensions &)result); - return jresult; + return jresult; } @@ -57632,7 +57711,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GetClosestImageSize__SWIG_1(char * jar } CALL_CATCH_EXCEPTION(0); } jresult = new Dali::ImageDimensions((const Dali::ImageDimensions &)result); - return jresult; + return jresult; } @@ -57663,7 +57742,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GetClosestImageSize__SWIG_2(char * jar } CALL_CATCH_EXCEPTION(0); } jresult = new Dali::ImageDimensions((const Dali::ImageDimensions &)result); - return jresult; + return jresult; } @@ -57692,7 +57771,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GetClosestImageSize__SWIG_3(char * jar } CALL_CATCH_EXCEPTION(0); } jresult = new Dali::ImageDimensions((const Dali::ImageDimensions &)result); - return jresult; + return jresult; } @@ -57713,7 +57792,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GetClosestImageSize__SWIG_4(char * jar } CALL_CATCH_EXCEPTION(0); } jresult = new Dali::ImageDimensions((const Dali::ImageDimensions &)result); - return jresult; + return jresult; } SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GetOriginalImageSize(char * jarg1) { @@ -57733,7 +57812,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_GetOriginalImageSize(char * jarg1) { } CALL_CATCH_EXCEPTION(0); } jresult = new Dali::ImageDimensions((const Dali::ImageDimensions &)result); - return jresult; + return jresult; } SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_DownloadImageSynchronously__SWIG_0(char * jarg1, void * jarg2, int jarg3, int jarg4, unsigned int jarg5) { diff --git a/dali-csharp-binder/src/gestures.cpp b/dali-csharp-binder/src/gestures.cpp index 99dc54b..68ab335 100755 --- a/dali-csharp-binder/src/gestures.cpp +++ b/dali-csharp-binder/src/gestures.cpp @@ -22,6 +22,7 @@ #include "common.h" #include #include +#include #ifdef __cplusplus extern "C" { @@ -324,6 +325,39 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RotationGesture__SWIG_0() { } +SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_RotationGesture_New(int jarg1) { + void * jresult ; + Dali::GestureState arg1 ; + Dali::RotationGesture result; + + arg1 = (Dali::GestureState)jarg1; + { + try { + result = DevelRotationGesture::New(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 (Dali::DaliException& e) { + { + SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0; + }; + } catch (...) { + { + SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; + }; + } + } + + jresult = new Dali::RotationGesture((const Dali::RotationGesture &)result); + return jresult; +} + + SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_RotationGesture__SWIG_1(void * jarg1) { void * jresult ; Dali::RotationGesture *arg1 = 0 ; diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec index 476c91e..175b9fc 100644 --- a/packaging/dali-csharp-binder.spec +++ b/packaging/dali-csharp-binder.spec @@ -21,7 +21,7 @@ Name: dali2-csharp-binder Summary: The DALI Csharp Binder -Version: 1.9.28 +Version: 1.9.29 Release: 1 Group: uifw/graphic License: Apache-2.0 and BSD-3-Clause and MIT