From d51fd7497d5da19b602e46e9011a13a8c67969d6 Mon Sep 17 00:00:00 2001 From: "adam.b" Date: Mon, 2 Oct 2017 11:48:22 +0100 Subject: [PATCH] Migration of devel API into public Migrated: DevelWindow DevelApplication::New() Conflicts: dali-csharp-binder/src/window.cpp Change-Id: I524c90a720b468392af27908d33a9f31993003ec --- dali-csharp-binder/src/application.cpp | 2 +- dali-csharp-binder/src/window.cpp | 173 ++++++++++++------------- 2 files changed, 87 insertions(+), 88 deletions(-) diff --git a/dali-csharp-binder/src/application.cpp b/dali-csharp-binder/src/application.cpp index 385d7c98..eccf293d 100755 --- a/dali-csharp-binder/src/application.cpp +++ b/dali-csharp-binder/src/application.cpp @@ -1287,7 +1287,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Application_New__SWIG_4(int jarg1, cha arg5 = *argp5; { try { - result = Dali::DevelApplication::New(arg1,arg2,(std::string const &)*arg3,arg4,arg5); + result = Dali::Application::New(arg1,arg2,(std::string const &)*arg3,arg4,arg5); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; diff --git a/dali-csharp-binder/src/window.cpp b/dali-csharp-binder/src/window.cpp index c214dbb8..40c9cea9 100755 --- a/dali-csharp-binder/src/window.cpp +++ b/dali-csharp-binder/src/window.cpp @@ -21,7 +21,6 @@ #include "common.h" #include #include -#include #include /* Callback for returning strings to C# without leaking memory */ @@ -47,19 +46,19 @@ SWIGINTERN void Dali_Signal_Sl_void_Sp_bool_SP__Sg__Emit(Dali::Signal< void (boo } /*ResizedSignal*/ -SWIGINTERN bool Dali_Signal_Sl_void_Sp_Dali_DevelWindow_WindowSize_SP__Sg__Empty(Dali::Signal< void (Dali::DevelWindow::WindowSize) > const *self){ +SWIGINTERN bool Dali_Signal_Sl_void_Sp_Dali_Window_WindowSize_SP__Sg__Empty(Dali::Signal< void (Dali::Window::WindowSize) > const *self){ return self->Empty(); } -SWIGINTERN std::size_t Dali_Signal_Sl_void_Sp_Dali_DevelWindow_WindowSize_SP__Sg__GetConnectionCount(Dali::Signal< void (Dali::DevelWindow::WindowSize) > const *self){ +SWIGINTERN std::size_t Dali_Signal_Sl_void_Sp_Dali_Window_WindowSize_SP__Sg__GetConnectionCount(Dali::Signal< void (Dali::Window::WindowSize) > const *self){ return self->GetConnectionCount(); } -SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_DevelWindow_WindowSize_SP__Sg__Connect(Dali::Signal< void (Dali::DevelWindow::WindowSize) > *self,void (*func)(Dali::DevelWindow::WindowSize)){ +SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Window_WindowSize_SP__Sg__Connect(Dali::Signal< void (Dali::Window::WindowSize) > *self,void (*func)(Dali::Window::WindowSize)){ self->Connect( func ); } -SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_DevelWindow_WindowSize_SP__Sg__Disconnect(Dali::Signal< void (Dali::DevelWindow::WindowSize) > *self,void (*func)(Dali::DevelWindow::WindowSize)){ +SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Window_WindowSize_SP__Sg__Disconnect(Dali::Signal< void (Dali::Window::WindowSize) > *self,void (*func)(Dali::Window::WindowSize)){ self->Disconnect( func ); } -SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_DevelWindow_WindowSize_SP__Sg__Emit(Dali::Signal< void (Dali::DevelWindow::WindowSize) > *self,Dali::DevelWindow::WindowSize arg){ +SWIGINTERN void Dali_Signal_Sl_void_Sp_Dali_Window_WindowSize_SP__Sg__Emit(Dali::Signal< void (Dali::Window::WindowSize) > *self,Dali::Window::WindowSize arg){ self->Emit( arg ); } @@ -626,7 +625,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FocusChangedSignal(void * jarg1) { void * jresult ; Dali::Window arg1 ; Dali::Window *argp1 ; - Dali::DevelWindow::FocusSignalType *result = 0 ; + Dali::Window::FocusSignalType *result = 0 ; argp1 = (Dali::Window *)jarg1; if (!argp1) { @@ -636,7 +635,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FocusChangedSignal(void * jarg1) { arg1 = *argp1; { try { - result = (Dali::DevelWindow::FocusSignalType *) &Dali::DevelWindow::FocusChangedSignal(arg1); + result = (Dali::Window::FocusSignalType*)&arg1.FocusChangedSignal(); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -665,7 +664,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SetAcceptFocus(void * jarg1, unsigned in arg2 = jarg2 ? true : false; { try { - Dali::DevelWindow::SetAcceptFocus(arg1,arg2); + arg1.SetAcceptFocus(arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; @@ -692,7 +691,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_IsFocusAcceptable(void * jarg1) arg1 = *argp1; { try { - result = (bool)Dali::DevelWindow::IsFocusAcceptable(arg1); + result = (bool)arg1.IsFocusAcceptable(); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -719,7 +718,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Show(void * jarg1) { arg1 = *argp1; { try { - Dali::DevelWindow::Show(arg1); + arg1.Show(); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; @@ -744,7 +743,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Hide(void * jarg1) { arg1 = *argp1; { try { - Dali::DevelWindow::Hide(arg1); + arg1.Hide(); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; @@ -771,7 +770,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_IsVisible(void * jarg1) { arg1 = *argp1; { try { - result = (bool)Dali::DevelWindow::IsVisible(arg1); + result = (bool)arg1.IsVisible(); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -800,7 +799,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_GetSupportedAuxiliaryHintCount(v arg1 = *argp1; { try { - result = (unsigned int)Dali::DevelWindow::GetSupportedAuxiliaryHintCount(arg1); + result = (unsigned int)arg1.GetSupportedAuxiliaryHintCount(); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -831,7 +830,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_GetSupportedAuxiliaryHint(void * jarg1 arg2 = (unsigned int)jarg2; { try { - result = Dali::DevelWindow::GetSupportedAuxiliaryHint(arg1,arg2); + result = arg1.GetSupportedAuxiliaryHint(arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -874,7 +873,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_AddAuxiliaryHint(void * jarg1, c arg3 = &arg3_str; { try { - result = (unsigned int)Dali::DevelWindow::AddAuxiliaryHint(arg1,(std::string const &)*arg2,(std::string const &)*arg3); + result = (unsigned int)arg1.AddAuxiliaryHint((std::string const &)*arg2,(std::string const &)*arg3); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -906,7 +905,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_RemoveAuxiliaryHint(void * jarg1 arg2 = (unsigned int)jarg2; { try { - result = (bool)Dali::DevelWindow::RemoveAuxiliaryHint(arg1,arg2); + result = (bool)arg1.RemoveAuxiliaryHint(arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -944,7 +943,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_SetAuxiliaryHintValue(void * jar arg3 = &arg3_str; { try { - result = (bool)Dali::DevelWindow::SetAuxiliaryHintValue(arg1,arg2,(std::string const &)*arg3); + result = (bool)arg1.SetAuxiliaryHintValue(arg2,(std::string const &)*arg3); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -978,7 +977,7 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_Dali_GetAuxiliaryHintValue(void * jarg1, un arg2 = (unsigned int)jarg2; { try { - result = Dali::DevelWindow::GetAuxiliaryHintValue(arg1,arg2); + result = arg1.GetAuxiliaryHintValue(arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -1014,7 +1013,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_GetAuxiliaryHintId(void * jarg1, arg2 = &arg2_str; { try { - result = (unsigned int)Dali::DevelWindow::GetAuxiliaryHintId(arg1,(std::string const &)*arg2); + result = (unsigned int)arg1.GetAuxiliaryHintId((std::string const &)*arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -1050,7 +1049,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SetInputRegion(void * jarg1, void * jarg } { try { - Dali::DevelWindow::SetInputRegion(arg1,(Dali::Rect< int > const &)*arg2); + arg1.SetInputRegion((Dali::Rect< int > const &)*arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; @@ -1065,7 +1064,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SetInputRegion(void * jarg1, void * jarg SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SetType(void * jarg1, int jarg2) { Dali::Window arg1 ; - Dali::DevelWindow::Type arg2 ; + Dali::Window::Type arg2 ; Dali::Window *argp1 ; argp1 = (Dali::Window *)jarg1; @@ -1074,10 +1073,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SetType(void * jarg1, int jarg2) { return ; } arg1 = *argp1; - arg2 = (Dali::DevelWindow::Type)jarg2; + arg2 = (Dali::Window::Type)jarg2; { try { - Dali::DevelWindow::SetType(arg1,arg2); + arg1.SetType(arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; @@ -1094,7 +1093,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GetType(void * jarg1) { int jresult ; Dali::Window arg1 ; Dali::Window *argp1 ; - Dali::DevelWindow::Type result; + Dali::Window::Type result; argp1 = (Dali::Window *)jarg1; if (!argp1) { @@ -1104,7 +1103,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GetType(void * jarg1) { arg1 = *argp1; { try { - result = (Dali::DevelWindow::Type)Dali::DevelWindow::GetType(arg1); + result = (Dali::Window::Type)arg1.GetType(); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -1122,7 +1121,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GetType(void * jarg1) { SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_SetNotificationLevel(void * jarg1, int jarg2) { unsigned int jresult ; Dali::Window arg1 ; - Dali::DevelWindow::NotificationLevel::Type arg2 ; + Dali::Window::NotificationLevel::Type arg2 ; Dali::Window *argp1 ; bool result; @@ -1132,10 +1131,10 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_SetNotificationLevel(void * jarg return 0; } arg1 = *argp1; - arg2 = (Dali::DevelWindow::NotificationLevel::Type)jarg2; + arg2 = (Dali::Window::NotificationLevel::Type)jarg2; { try { - result = (bool)Dali::DevelWindow::SetNotificationLevel(arg1,arg2); + result = (bool)arg1.SetNotificationLevel(arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -1154,7 +1153,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GetNotificationLevel(void * jarg1) { int jresult ; Dali::Window arg1 ; Dali::Window *argp1 ; - Dali::DevelWindow::NotificationLevel::Type result; + Dali::Window::NotificationLevel::Type result; argp1 = (Dali::Window *)jarg1; if (!argp1) { @@ -1164,7 +1163,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GetNotificationLevel(void * jarg1) { arg1 = *argp1; { try { - result = (Dali::DevelWindow::NotificationLevel::Type)Dali::DevelWindow::GetNotificationLevel(arg1); + result = (Dali::Window::NotificationLevel::Type)arg1.GetNotificationLevel(); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -1193,7 +1192,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_SetOpaqueState(void * jarg1, unsigned in arg2 = jarg2 ? true : false; { try { - Dali::DevelWindow::SetOpaqueState(arg1,arg2); + arg1.SetOpaqueState(arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; @@ -1220,7 +1219,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_IsOpaqueState(void * jarg1) { arg1 = *argp1; { try { - result = (bool)Dali::DevelWindow::IsOpaqueState(arg1); + result = (bool)arg1.IsOpaqueState(); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -1235,10 +1234,10 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_IsOpaqueState(void * jarg1) { } -SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_SetScreenMode(void * jarg1, int jarg2) { +SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_SetScreenOffMode(void * jarg1, int jarg2) { unsigned int jresult ; Dali::Window arg1 ; - Dali::DevelWindow::ScreenMode::Type arg2 ; + Dali::Window::ScreenOffMode::Type arg2 ; Dali::Window *argp1 ; bool result; @@ -1248,10 +1247,10 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_SetScreenMode(void * jarg1, int return 0; } arg1 = *argp1; - arg2 = (Dali::DevelWindow::ScreenMode::Type)jarg2; + arg2 = (Dali::Window::ScreenOffMode::Type)jarg2; { try { - result = (bool)Dali::DevelWindow::SetScreenMode(arg1,arg2); + result = (bool)arg1.SetScreenOffMode(arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -1266,11 +1265,11 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_SetScreenMode(void * jarg1, int } -SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GetScreenMode(void * jarg1) { +SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GetScreenOffMode(void * jarg1) { int jresult ; Dali::Window arg1 ; Dali::Window *argp1 ; - Dali::DevelWindow::ScreenMode::Type result; + Dali::Window::ScreenOffMode::Type result; argp1 = (Dali::Window *)jarg1; if (!argp1) { @@ -1280,7 +1279,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GetScreenMode(void * jarg1) { arg1 = *argp1; { try { - result = (Dali::DevelWindow::ScreenMode::Type)Dali::DevelWindow::GetScreenMode(arg1); + result = (Dali::Window::ScreenOffMode::Type)arg1.GetScreenOffMode(); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -1311,7 +1310,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_SetBrightness(void * jarg1, int arg2 = (int)jarg2; { try { - result = (bool)Dali::DevelWindow::SetBrightness(arg1,arg2); + result = (bool)arg1.SetBrightness(arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -1340,7 +1339,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_GetBrightness(void * jarg1) { arg1 = *argp1; { try { - result = (int)Dali::DevelWindow::GetBrightness(arg1); + result = (int)arg1.GetBrightness(); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -1508,7 +1507,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_ResizedSignal(void * jarg1) { void * jresult ; Dali::Window arg1 ; Dali::Window *argp1 ; - Dali::DevelWindow::ResizedSignalType *result = 0 ; + Dali::Window::ResizedSignalType *result = 0 ; argp1 = (Dali::Window *)jarg1; if (!argp1) { @@ -1518,7 +1517,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_ResizedSignal(void * jarg1) { arg1 = *argp1; { try { - result = (Dali::DevelWindow::ResizedSignalType *) &Dali::DevelWindow::ResizedSignal(arg1); + result = (Dali::Window::ResizedSignalType *) &arg1.ResizedSignal(); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -1535,13 +1534,13 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_ResizedSignal(void * jarg1) { /*ResizedSignal binding*/ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ResizedSignal_Empty(void * jarg1) { unsigned int jresult ; - Dali::Signal< void (Dali::DevelWindow::WindowSize) > *arg1 = (Dali::Signal< void (Dali::DevelWindow::WindowSize) > *) 0 ; + Dali::Signal< void (Dali::Window::WindowSize) > *arg1 = (Dali::Signal< void (Dali::Window::WindowSize) > *) 0 ; bool result; - arg1 = (Dali::Signal< void (Dali::DevelWindow::WindowSize) > *)jarg1; + arg1 = (Dali::Signal< void (Dali::Window::WindowSize) > *)jarg1; { try { - result = (bool)Dali_Signal_Sl_void_Sp_Dali_DevelWindow_WindowSize_SP__Sg__Empty((Dali::Signal< void (Dali::DevelWindow::WindowSize) > const *)arg1); + result = (bool)Dali_Signal_Sl_void_Sp_Dali_Window_WindowSize_SP__Sg__Empty((Dali::Signal< void (Dali::Window::WindowSize) > const *)arg1); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -1558,13 +1557,13 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_ResizedSignal_Empty(void * jarg1 SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ResizedSignal_GetConnectionCount(void * jarg1) { unsigned long jresult ; - Dali::Signal< void (Dali::DevelWindow::WindowSize) > *arg1 = (Dali::Signal< void (Dali::DevelWindow::WindowSize) > *) 0 ; + Dali::Signal< void (Dali::Window::WindowSize) > *arg1 = (Dali::Signal< void (Dali::Window::WindowSize) > *) 0 ; std::size_t result; - arg1 = (Dali::Signal< void (Dali::DevelWindow::WindowSize) > *)jarg1; + arg1 = (Dali::Signal< void (Dali::Window::WindowSize) > *)jarg1; { try { - result = Dali_Signal_Sl_void_Sp_Dali_DevelWindow_WindowSize_SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::DevelWindow::WindowSize) > const *)arg1); + result = Dali_Signal_Sl_void_Sp_Dali_Window_WindowSize_SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::Window::WindowSize) > const *)arg1); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -1580,14 +1579,14 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ResizedSignal_GetConnectionCoun SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ResizedSignal_Connect(void * jarg1, void * jarg2) { - Dali::Signal< void (Dali::DevelWindow::WindowSize) > *arg1 = (Dali::Signal< void (Dali::DevelWindow::WindowSize) > *) 0 ; - void (*arg2)(Dali::DevelWindow::WindowSize) = (void (*)(Dali::DevelWindow::WindowSize)) 0 ; + Dali::Signal< void (Dali::Window::WindowSize) > *arg1 = (Dali::Signal< void (Dali::Window::WindowSize) > *) 0 ; + void (*arg2)(Dali::Window::WindowSize) = (void (*)(Dali::Window::WindowSize)) 0 ; - arg1 = (Dali::Signal< void (Dali::DevelWindow::WindowSize) > *)jarg1; - arg2 = (void (*)(Dali::DevelWindow::WindowSize))jarg2; + arg1 = (Dali::Signal< void (Dali::Window::WindowSize) > *)jarg1; + arg2 = (void (*)(Dali::Window::WindowSize))jarg2; { try { - Dali_Signal_Sl_void_Sp_Dali_DevelWindow_WindowSize_SP__Sg__Connect(arg1,arg2); + Dali_Signal_Sl_void_Sp_Dali_Window_WindowSize_SP__Sg__Connect(arg1,arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; @@ -1601,14 +1600,14 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ResizedSignal_Connect(void * jarg1, void SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ResizedSignal_Disconnect(void * jarg1, void * jarg2) { - Dali::Signal< void (Dali::DevelWindow::WindowSize) > *arg1 = (Dali::Signal< void (Dali::DevelWindow::WindowSize) > *) 0 ; - void (*arg2)(Dali::DevelWindow::WindowSize) = (void (*)(Dali::DevelWindow::WindowSize)) 0 ; + Dali::Signal< void (Dali::Window::WindowSize) > *arg1 = (Dali::Signal< void (Dali::Window::WindowSize) > *) 0 ; + void (*arg2)(Dali::Window::WindowSize) = (void (*)(Dali::Window::WindowSize)) 0 ; - arg1 = (Dali::Signal< void (Dali::DevelWindow::WindowSize) > *)jarg1; - arg2 = (void (*)(Dali::DevelWindow::WindowSize))jarg2; + arg1 = (Dali::Signal< void (Dali::Window::WindowSize) > *)jarg1; + arg2 = (void (*)(Dali::Window::WindowSize))jarg2; { try { - Dali_Signal_Sl_void_Sp_Dali_DevelWindow_WindowSize_SP__Sg__Disconnect(arg1,arg2); + Dali_Signal_Sl_void_Sp_Dali_Window_WindowSize_SP__Sg__Disconnect(arg1,arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; @@ -1622,20 +1621,20 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ResizedSignal_Disconnect(void * jarg1, v SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ResizedSignal_Emit(void * jarg1, void * jarg2) { - Dali::Signal< void (Dali::DevelWindow::WindowSize) > *arg1 = (Dali::Signal< void (Dali::DevelWindow::WindowSize) > *) 0 ; - Dali::DevelWindow::WindowSize arg2 ; - Dali::DevelWindow::WindowSize *argp2 ; + Dali::Signal< void (Dali::Window::WindowSize) > *arg1 = (Dali::Signal< void (Dali::Window::WindowSize) > *) 0 ; + Dali::Window::WindowSize arg2 ; + Dali::Window::WindowSize *argp2 ; - arg1 = (Dali::Signal< void (Dali::DevelWindow::WindowSize) > *)jarg1; - argp2 = (Dali::DevelWindow::WindowSize *)jarg2; + arg1 = (Dali::Signal< void (Dali::Window::WindowSize) > *)jarg1; + argp2 = (Dali::Window::WindowSize *)jarg2; if (!argp2) { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::DevelWindow::WindowSize", 0); + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window::WindowSize", 0); return ; } arg2 = *argp2; { try { - Dali_Signal_Sl_void_Sp_Dali_DevelWindow_WindowSize_SP__Sg__Emit(arg1,arg2); + Dali_Signal_Sl_void_Sp_Dali_Window_WindowSize_SP__Sg__Emit(arg1,arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; @@ -1650,11 +1649,11 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ResizedSignal_Emit(void * jarg1, void * SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ResizedSignal() { void * jresult ; - Dali::Signal< void (Dali::DevelWindow::WindowSize) > *result = 0 ; + Dali::Signal< void (Dali::Window::WindowSize) > *result = 0 ; { try { - result = (Dali::Signal< void (Dali::DevelWindow::WindowSize) > *)new Dali::Signal< void (Dali::DevelWindow::WindowSize) >(); + result = (Dali::Signal< void (Dali::Window::WindowSize) > *)new Dali::Signal< void (Dali::Window::WindowSize) >(); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -1670,9 +1669,9 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ResizedSignal() { SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ResizedSignal(void * jarg1) { - Dali::Signal< void (Dali::DevelWindow::WindowSize) > *arg1 = (Dali::Signal< void (Dali::DevelWindow::WindowSize) > *) 0 ; + Dali::Signal< void (Dali::Window::WindowSize) > *arg1 = (Dali::Signal< void (Dali::Window::WindowSize) > *) 0 ; - arg1 = (Dali::Signal< void (Dali::DevelWindow::WindowSize) > *)jarg1; + arg1 = (Dali::Signal< void (Dali::Window::WindowSize) > *)jarg1; { try { delete arg1; @@ -1689,9 +1688,9 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ResizedSignal(void * jarg1) { SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_SetSize(void * jarg1, void * jarg2) { Dali::Window arg1 ; - Dali::DevelWindow::WindowSize arg2 ; + Dali::Window::WindowSize arg2 ; Dali::Window *argp1 ; - Dali::DevelWindow::WindowSize *argp2 ; + Dali::Window::WindowSize *argp2 ; argp1 = (Dali::Window *)jarg1; if (!argp1) { @@ -1699,15 +1698,15 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_SetSize(void * jarg1, void * jarg return ; } arg1 = *argp1; - argp2 = (Dali::DevelWindow::WindowSize *)jarg2; + argp2 = (Dali::Window::WindowSize *)jarg2; if (!argp2) { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::DevelWindow::WindowSize", 0); + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window::WindowSize", 0); return ; } arg2 = *argp2; { try { - Dali::DevelWindow::SetSize(arg1,arg2); + arg1.SetSize(arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; @@ -1724,7 +1723,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetSize(void * jarg1) { void * jresult ; Dali::Window arg1 ; Dali::Window *argp1 ; - Dali::DevelWindow::WindowSize result; + Dali::Window::WindowSize result; argp1 = (Dali::Window *)jarg1; if (!argp1) { @@ -1734,7 +1733,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetSize(void * jarg1) { arg1 = *argp1; { try { - result = Dali::DevelWindow::GetSize(arg1); + result = arg1.GetSize(); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -1744,16 +1743,16 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetSize(void * jarg1) { 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::DevelWindow::WindowSize((const Dali::DevelWindow::WindowSize &)result); + jresult = new Dali::Window::WindowSize((const Dali::Window::WindowSize &)result); return jresult; } SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_SetPosition(void * jarg1, void * jarg2) { Dali::Window arg1 ; - Dali::DevelWindow::WindowPosition arg2 ; + Dali::Window::WindowPosition arg2 ; Dali::Window *argp1 ; - Dali::DevelWindow::WindowPosition *argp2 ; + Dali::Window::WindowPosition *argp2 ; argp1 = (Dali::Window *)jarg1; if (!argp1) { @@ -1761,15 +1760,15 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_SetPosition(void * jarg1, void * return ; } arg1 = *argp1; - argp2 = (Dali::DevelWindow::WindowPosition *)jarg2; + argp2 = (Dali::Window::WindowPosition *)jarg2; if (!argp2) { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::DevelWindow::WindowPosition", 0); + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window::WindowPosition", 0); return ; } arg2 = *argp2; { try { - Dali::DevelWindow::SetPosition(arg1,arg2); + arg1.SetPosition(arg2); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; @@ -1786,7 +1785,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetPosition(void * jarg1) { void * jresult ; Dali::Window arg1 ; Dali::Window *argp1 ; - Dali::DevelWindow::WindowPosition result; + Dali::Window::WindowPosition result; argp1 = (Dali::Window *)jarg1; if (!argp1) { @@ -1796,7 +1795,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetPosition(void * jarg1) { arg1 = *argp1; { try { - result = Dali::DevelWindow::GetPosition(arg1); + result = arg1.GetPosition(); } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return 0; @@ -1806,7 +1805,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetPosition(void * jarg1) { 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::DevelWindow::WindowPosition((const Dali::DevelWindow::WindowPosition &)result); + jresult = new Dali::Window::WindowPosition((const Dali::Window::WindowPosition &)result); return jresult; } -- 2.34.1