projects / platform / core / uifw / dali-csharp-binder.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4777f79)
Rename OnStage signals and related internal changes 20/240220/1
authorRichard Huang <r.huang@samsung.com>
Tue, 4 Aug 2020 11:13:48 +0000 (12:13 +0100)
committerRichard Huang <r.huang@samsung.com>
Tue, 4 Aug 2020 11:13:48 +0000 (12:13 +0100)
Change-Id: I4192c41b52107ce56c837644bf32cab527807d89

dali-csharp-binder/src/dali_wrap.cpp patch | blob | history
dali-csharp-binder/src/dali_wrap.h patch | blob | history
dali-csharp-binder/src/view-wrapper-impl-wrap.cpp patch | blob | history
dali-csharp-binder/src/view-wrapper-impl-wrap.h patch | blob | history

diff --git a/dali-csharp-binder/src/dali_wrap.cpp b/dali-csharp-binder/src/dali_wrap.cpp
index 8476a5b..7d9bdf4 100644 (file)
--- a/dali-csharp-binder/src/dali_wrap.cpp
+++ b/dali-csharp-binder/src/dali_wrap.cpp
@@ -1821,24 +1821,24 @@ SwigDirector_ViewImpl::~SwigDirector_ViewImpl() {
 }
 
 
-void SwigDirector_ViewImpl::OnStageConnection(int depth) {
+void SwigDirector_ViewImpl::OnSceneConnection(int depth) {
   int jdepth  ;
 
-  if (!swig_callbackOnStageConnection) {
-    Dali::Toolkit::Internal::Control::OnStageConnection(depth);
+  if (!swig_callbackOnSceneConnection) {
+    Dali::Toolkit::Internal::Control::OnSceneConnection(depth);
     return;
   } else {
     jdepth = depth;
-    swig_callbackOnStageConnection(jdepth);
+    swig_callbackOnSceneConnection(jdepth);
   }
 }
 
-void SwigDirector_ViewImpl::OnStageDisconnection() {
-  if (!swig_callbackOnStageDisconnection) {
-    Dali::Toolkit::Internal::Control::OnStageDisconnection();
+void SwigDirector_ViewImpl::OnSceneDisconnection() {
+  if (!swig_callbackOnSceneDisconnection) {
+    Dali::Toolkit::Internal::Control::OnSceneDisconnection();
     return;
   } else {
-    swig_callbackOnStageDisconnection();
+    swig_callbackOnSceneDisconnection();
   }
 }
 
@@ -2343,9 +2343,9 @@ Dali::Toolkit::Internal::Control::Extension *SwigDirector_ViewImpl::GetControlEx
   return Dali::Toolkit::Internal::Control::GetControlExtension();
 }
 
-void SwigDirector_ViewImpl::swig_connect_director(SWIG_Callback0_t callbackOnStageConnection, SWIG_Callback1_t callbackOnStageDisconnection, SWIG_Callback2_t callbackOnChildAdd, SWIG_Callback3_t callbackOnChildRemove, SWIG_Callback4_t callbackOnPropertySet, SWIG_Callback5_t callbackOnSizeSet, SWIG_Callback6_t callbackOnSizeAnimation, SWIG_Callback7_t callbackOnTouchEvent, SWIG_Callback8_t callbackOnHoverEvent, SWIG_Callback9_t callbackOnKeyEvent, SWIG_Callback10_t callbackOnWheelEvent, SWIG_Callback11_t callbackOnRelayout, SWIG_Callback12_t callbackOnSetResizePolicy, SWIG_Callback13_t callbackGetNaturalSize, SWIG_Callback14_t callbackCalculateChildSize, SWIG_Callback15_t callbackGetHeightForWidth, SWIG_Callback16_t callbackGetWidthForHeight, SWIG_Callback17_t callbackRelayoutDependentOnChildren__SWIG_0, SWIG_Callback18_t callbackRelayoutDependentOnChildren__SWIG_1, SWIG_Callback19_t callbackOnCalculateRelayoutSize, SWIG_Callback20_t callbackOnLayoutNegotiated, SWIG_Callback21_t callbackOnInitialize, SWIG_Callback24_t callbackOnStyleChange, SWIG_Callback25_t callbackOnAccessibilityActivated, SWIG_Callback26_t callbackOnAccessibilityPan, SWIG_Callback27_t callbackOnAccessibilityTouch, SWIG_Callback28_t callbackOnAccessibilityValueChange, SWIG_Callback29_t callbackOnAccessibilityZoom, SWIG_Callback30_t callbackOnKeyInputFocusGained, SWIG_Callback31_t callbackOnKeyInputFocusLost, SWIG_Callback32_t callbackGetNextKeyboardFocusableActor, SWIG_Callback33_t callbackOnKeyboardFocusChangeCommitted, SWIG_Callback34_t callbackOnKeyboardEnter, SWIG_Callback35_t callbackOnPinch, SWIG_Callback36_t callbackOnPan, SWIG_Callback37_t callbackOnTap, SWIG_Callback38_t callbackOnLongPress, SWIG_Callback39_t callbackSignalConnected, SWIG_Callback40_t callbackSignalDisconnected) {
-  swig_callbackOnStageConnection = callbackOnStageConnection;
-  swig_callbackOnStageDisconnection = callbackOnStageDisconnection;
+void SwigDirector_ViewImpl::swig_connect_director(SWIG_Callback0_t callbackOnSceneConnection, SWIG_Callback1_t callbackOnSceneDisconnection, SWIG_Callback2_t callbackOnChildAdd, SWIG_Callback3_t callbackOnChildRemove, SWIG_Callback4_t callbackOnPropertySet, SWIG_Callback5_t callbackOnSizeSet, SWIG_Callback6_t callbackOnSizeAnimation, SWIG_Callback7_t callbackOnTouchEvent, SWIG_Callback8_t callbackOnHoverEvent, SWIG_Callback9_t callbackOnKeyEvent, SWIG_Callback10_t callbackOnWheelEvent, SWIG_Callback11_t callbackOnRelayout, SWIG_Callback12_t callbackOnSetResizePolicy, SWIG_Callback13_t callbackGetNaturalSize, SWIG_Callback14_t callbackCalculateChildSize, SWIG_Callback15_t callbackGetHeightForWidth, SWIG_Callback16_t callbackGetWidthForHeight, SWIG_Callback17_t callbackRelayoutDependentOnChildren__SWIG_0, SWIG_Callback18_t callbackRelayoutDependentOnChildren__SWIG_1, SWIG_Callback19_t callbackOnCalculateRelayoutSize, SWIG_Callback20_t callbackOnLayoutNegotiated, SWIG_Callback21_t callbackOnInitialize, SWIG_Callback24_t callbackOnStyleChange, SWIG_Callback25_t callbackOnAccessibilityActivated, SWIG_Callback26_t callbackOnAccessibilityPan, SWIG_Callback27_t callbackOnAccessibilityTouch, SWIG_Callback28_t callbackOnAccessibilityValueChange, SWIG_Callback29_t callbackOnAccessibilityZoom, SWIG_Callback30_t callbackOnKeyInputFocusGained, SWIG_Callback31_t callbackOnKeyInputFocusLost, SWIG_Callback32_t callbackGetNextKeyboardFocusableActor, SWIG_Callback33_t callbackOnKeyboardFocusChangeCommitted, SWIG_Callback34_t callbackOnKeyboardEnter, SWIG_Callback35_t callbackOnPinch, SWIG_Callback36_t callbackOnPan, SWIG_Callback37_t callbackOnTap, SWIG_Callback38_t callbackOnLongPress, SWIG_Callback39_t callbackSignalConnected, SWIG_Callback40_t callbackSignalDisconnected) {
+  swig_callbackOnSceneConnection = callbackOnSceneConnection;
+  swig_callbackOnSceneDisconnection = callbackOnSceneDisconnection;
   swig_callbackOnChildAdd = callbackOnChildAdd;
   swig_callbackOnChildRemove = callbackOnChildRemove;
   swig_callbackOnPropertySet = callbackOnPropertySet;
@@ -2386,8 +2386,8 @@ void SwigDirector_ViewImpl::swig_connect_director(SWIG_Callback0_t callbackOnSta
 }
 
 void SwigDirector_ViewImpl::swig_init_callbacks() {
-  swig_callbackOnStageConnection = 0;
-  swig_callbackOnStageDisconnection = 0;
+  swig_callbackOnSceneConnection = 0;
+  swig_callbackOnSceneDisconnection = 0;
   swig_callbackOnChildAdd = 0;
   swig_callbackOnChildRemove = 0;
   swig_callbackOnPropertySet = 0;
@@ -36783,15 +36783,15 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_WheelEventSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_OnStageSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_OnSceneSignal(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
-  Dali::Actor::OnStageSignalType *result = 0 ;
+  Dali::Actor::OnSceneSignalType *result = 0 ;
 
   arg1 = (Dali::Actor *)jarg1;
   {
     try {
-      result = (Dali::Actor::OnStageSignalType *) &(arg1)->OnStageSignal();
+      result = (Dali::Actor::OnSceneSignalType *) &(arg1)->OnSceneSignal();
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
@@ -36816,15 +36816,15 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_OnStageSignal(void * jarg1) {
 }
 
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_OffStageSignal(void * jarg1) {
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Actor_OffSceneSignal(void * jarg1) {
   void * jresult ;
   Dali::Actor *arg1 = (Dali::Actor *) 0 ;
-  Dali::Actor::OffStageSignalType *result = 0 ;
+  Dali::Actor::OffSceneSignalType *result = 0 ;
 
   arg1 = (Dali::Actor *)jarg1;
   {
     try {
-      result = (Dali::Actor::OffStageSignalType *) &(arg1)->OffStageSignal();
+      result = (Dali::Actor::OffSceneSignalType *) &(arg1)->OffSceneSignal();
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
@@ -38488,7 +38488,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_CustomActorImpl_Self(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnStageConnection(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnSceneConnection(void * jarg1, int jarg2) {
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
   int arg2 ;
 
@@ -38496,7 +38496,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnStageConnection(void *
   arg2 = (int)jarg2;
   {
     try {
-      (arg1)->OnStageConnection(arg2);
+      (arg1)->OnSceneConnection(arg2);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
@@ -38519,13 +38519,13 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnStageConnection(void *
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnStageDisconnection(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_CustomActorImpl_OnSceneDisconnection(void * jarg1) {
   Dali::CustomActorImpl *arg1 = (Dali::CustomActorImpl *) 0 ;
 
   arg1 = (Dali::CustomActorImpl *)jarg1;
   {
     try {
-      (arg1)->OnStageDisconnection();
+      (arg1)->OnSceneDisconnection();
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
@@ -59776,7 +59776,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ViewImpl_KeyInputFocusLostSignal(void
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnStageConnection(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnSceneConnection(void * jarg1, int jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   int arg2 ;
   SwigDirector_ViewImpl *darg = 0;
@@ -59791,7 +59791,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnStageConnection(void * jarg1,
   {
     try {
       if(darg) {
-        (darg)->OnStageConnection(arg2);
+        (darg)->OnSceneConnection(arg2);
       }
     } catch (std::out_of_range& e) {
       {
@@ -59815,7 +59815,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnStageConnection(void * jarg1,
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnStageConnectionSwigExplicitViewImpl(void * jarg1, int jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnSceneConnectionSwigExplicitViewImpl(void * jarg1, int jarg2) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   int arg2 ;
   SwigDirector_ViewImpl *darg = 0;
@@ -59830,7 +59830,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnStageConnectionSwigExplicitVi
   {
     try {
       if(darg) {
-        (darg)->OnStageConnectionSwigPublic(arg2);
+        (darg)->OnSceneConnectionSwigPublic(arg2);
       }
     } catch (std::out_of_range& e) {
       {
@@ -59854,7 +59854,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnStageConnectionSwigExplicitVi
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnStageDisconnection(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnSceneDisconnection(void * jarg1) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   SwigDirector_ViewImpl *darg = 0;
 
@@ -59867,7 +59867,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnStageDisconnection(void * jar
   {
     try {
       if(darg) {
-        (darg)->OnStageDisconnection();
+        (darg)->OnSceneDisconnection();
       }
     } catch (std::out_of_range& e) {
       {
@@ -59891,7 +59891,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnStageDisconnection(void * jar
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnStageDisconnectionSwigExplicitViewImpl(void * jarg1) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnSceneDisconnectionSwigExplicitViewImpl(void * jarg1) {
   Dali::Toolkit::Internal::Control *arg1 = (Dali::Toolkit::Internal::Control *) 0 ;
   SwigDirector_ViewImpl *darg = 0;
 
@@ -59904,7 +59904,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ViewImpl_OnStageDisconnectionSwigExplici
   {
     try {
       if(darg) {
-        (darg)->OnStageDisconnectionSwigPublic();
+        (darg)->OnSceneDisconnectionSwigPublic();
       }
     } catch (std::out_of_range& e) {
       {
diff --git a/dali-csharp-binder/src/dali_wrap.h b/dali-csharp-binder/src/dali_wrap.h
index 5786544..23f8448 100755 (executable)
--- a/dali-csharp-binder/src/dali_wrap.h
+++ b/dali-csharp-binder/src/dali_wrap.h
@@ -52,13 +52,13 @@ class SwigDirector_ViewImpl : public Dali::Toolkit::Internal::Control, public Sw
 public:
     SwigDirector_ViewImpl(Dali::Toolkit::Internal::Control::ControlBehaviour behaviourFlags);
     virtual ~SwigDirector_ViewImpl();
-    virtual void OnStageConnection(int depth);
-    virtual void OnStageConnectionSwigPublic(int depth) {
-      Dali::Toolkit::Internal::Control::OnStageConnection(depth);
+    virtual void OnSceneConnection(int depth);
+    virtual void OnSceneConnectionSwigPublic(int depth) {
+      Dali::Toolkit::Internal::Control::OnSceneConnection(depth);
     }
-    virtual void OnStageDisconnection();
-    virtual void OnStageDisconnectionSwigPublic() {
-      Dali::Toolkit::Internal::Control::OnStageDisconnection();
+    virtual void OnSceneDisconnection();
+    virtual void OnSceneDisconnectionSwigPublic() {
+      Dali::Toolkit::Internal::Control::OnSceneDisconnection();
     }
     virtual void OnChildAdd(Dali::Actor &child);
     virtual void OnChildAddSwigPublic(Dali::Actor &child) {
@@ -194,11 +194,11 @@ public:
     typedef void (SWIGSTDCALL* SWIG_Callback38_t)(void *);
     typedef void (SWIGSTDCALL* SWIG_Callback39_t)(void *, void *);
     typedef void (SWIGSTDCALL* SWIG_Callback40_t)(void *, void *);
-    void swig_connect_director(SWIG_Callback0_t callbackOnStageConnection, SWIG_Callback1_t callbackOnStageDisconnection, SWIG_Callback2_t callbackOnChildAdd, SWIG_Callback3_t callbackOnChildRemove, SWIG_Callback4_t callbackOnPropertySet, SWIG_Callback5_t callbackOnSizeSet, SWIG_Callback6_t callbackOnSizeAnimation, SWIG_Callback7_t callbackOnTouchEvent, SWIG_Callback8_t callbackOnHoverEvent, SWIG_Callback9_t callbackOnKeyEvent, SWIG_Callback10_t callbackOnWheelEvent, SWIG_Callback11_t callbackOnRelayout, SWIG_Callback12_t callbackOnSetResizePolicy, SWIG_Callback13_t callbackGetNaturalSize, SWIG_Callback14_t callbackCalculateChildSize, SWIG_Callback15_t callbackGetHeightForWidth, SWIG_Callback16_t callbackGetWidthForHeight, SWIG_Callback17_t callbackRelayoutDependentOnChildren__SWIG_0, SWIG_Callback18_t callbackRelayoutDependentOnChildren__SWIG_1, SWIG_Callback19_t callbackOnCalculateRelayoutSize, SWIG_Callback20_t callbackOnLayoutNegotiated, SWIG_Callback21_t callbackOnInitialize, SWIG_Callback24_t callbackOnStyleChange, SWIG_Callback25_t callbackOnAccessibilityActivated, SWIG_Callback26_t callbackOnAccessibilityPan, SWIG_Callback27_t callbackOnAccessibilityTouch, SWIG_Callback28_t callbackOnAccessibilityValueChange, SWIG_Callback29_t callbackOnAccessibilityZoom, SWIG_Callback30_t callbackOnKeyInputFocusGained, SWIG_Callback31_t callbackOnKeyInputFocusLost, SWIG_Callback32_t callbackGetNextKeyboardFocusableActor, SWIG_Callback33_t callbackOnKeyboardFocusChangeCommitted, SWIG_Callback34_t callbackOnKeyboardEnter, SWIG_Callback35_t callbackOnPinch, SWIG_Callback36_t callbackOnPan, SWIG_Callback37_t callbackOnTap, SWIG_Callback38_t callbackOnLongPress, SWIG_Callback39_t callbackSignalConnected, SWIG_Callback40_t callbackSignalDisconnected);
+    void swig_connect_director(SWIG_Callback0_t callbackOnSceneConnection, SWIG_Callback1_t callbackOnSceneDisconnection, SWIG_Callback2_t callbackOnChildAdd, SWIG_Callback3_t callbackOnChildRemove, SWIG_Callback4_t callbackOnPropertySet, SWIG_Callback5_t callbackOnSizeSet, SWIG_Callback6_t callbackOnSizeAnimation, SWIG_Callback7_t callbackOnTouchEvent, SWIG_Callback8_t callbackOnHoverEvent, SWIG_Callback9_t callbackOnKeyEvent, SWIG_Callback10_t callbackOnWheelEvent, SWIG_Callback11_t callbackOnRelayout, SWIG_Callback12_t callbackOnSetResizePolicy, SWIG_Callback13_t callbackGetNaturalSize, SWIG_Callback14_t callbackCalculateChildSize, SWIG_Callback15_t callbackGetHeightForWidth, SWIG_Callback16_t callbackGetWidthForHeight, SWIG_Callback17_t callbackRelayoutDependentOnChildren__SWIG_0, SWIG_Callback18_t callbackRelayoutDependentOnChildren__SWIG_1, SWIG_Callback19_t callbackOnCalculateRelayoutSize, SWIG_Callback20_t callbackOnLayoutNegotiated, SWIG_Callback21_t callbackOnInitialize, SWIG_Callback24_t callbackOnStyleChange, SWIG_Callback25_t callbackOnAccessibilityActivated, SWIG_Callback26_t callbackOnAccessibilityPan, SWIG_Callback27_t callbackOnAccessibilityTouch, SWIG_Callback28_t callbackOnAccessibilityValueChange, SWIG_Callback29_t callbackOnAccessibilityZoom, SWIG_Callback30_t callbackOnKeyInputFocusGained, SWIG_Callback31_t callbackOnKeyInputFocusLost, SWIG_Callback32_t callbackGetNextKeyboardFocusableActor, SWIG_Callback33_t callbackOnKeyboardFocusChangeCommitted, SWIG_Callback34_t callbackOnKeyboardEnter, SWIG_Callback35_t callbackOnPinch, SWIG_Callback36_t callbackOnPan, SWIG_Callback37_t callbackOnTap, SWIG_Callback38_t callbackOnLongPress, SWIG_Callback39_t callbackSignalConnected, SWIG_Callback40_t callbackSignalDisconnected);
 
 private:
-    SWIG_Callback0_t swig_callbackOnStageConnection;
-    SWIG_Callback1_t swig_callbackOnStageDisconnection;
+    SWIG_Callback0_t swig_callbackOnSceneConnection;
+    SWIG_Callback1_t swig_callbackOnSceneDisconnection;
     SWIG_Callback2_t swig_callbackOnChildAdd;
     SWIG_Callback3_t swig_callbackOnChildRemove;
     SWIG_Callback4_t swig_callbackOnPropertySet;
diff --git a/dali-csharp-binder/src/view-wrapper-impl-wrap.cpp b/dali-csharp-binder/src/view-wrapper-impl-wrap.cpp
index 0f5cebe..43a063a 100755 (executable)
--- a/dali-csharp-binder/src/view-wrapper-impl-wrap.cpp
+++ b/dali-csharp-binder/src/view-wrapper-impl-wrap.cpp
@@ -35,16 +35,16 @@ SwigDirector_ViewWrapperImpl::~SwigDirector_ViewWrapperImpl() {
 }
 
 
-void SwigDirector_ViewWrapperImpl::OnStageConnection(int depth) {
-    swig_callbackOnStageConnection(depth);
+void SwigDirector_ViewWrapperImpl::OnSceneConnection(int depth) {
+    swig_callbackOnSceneConnection(depth);
 
-    Dali::Toolkit::Internal::Control::OnStageConnection(depth);
+    Dali::Toolkit::Internal::Control::OnSceneConnection(depth);
 }
 
-void SwigDirector_ViewWrapperImpl::OnStageDisconnection() {
-    swig_callbackOnStageDisconnection();
+void SwigDirector_ViewWrapperImpl::OnSceneDisconnection() {
+    swig_callbackOnSceneDisconnection();
 
-    Dali::Toolkit::Internal::Control::OnStageDisconnection();
+    Dali::Toolkit::Internal::Control::OnSceneDisconnection();
 }
 
 void SwigDirector_ViewWrapperImpl::OnChildAdd(Dali::Actor &child) {
@@ -447,9 +447,9 @@ Dali::Toolkit::Internal::Control::Extension *SwigDirector_ViewWrapperImpl::GetCo
   return Dali::Toolkit::Internal::Control::GetControlExtension();
 }
 
-void SwigDirector_ViewWrapperImpl::swig_connect_director(SWIG_Callback0_t callbackOnStageConnection, SWIG_Callback1_t callbackOnStageDisconnection, SWIG_Callback2_t callbackOnChildAdd, SWIG_Callback3_t callbackOnChildRemove, SWIG_Callback4_t callbackOnPropertySet, SWIG_Callback5_t callbackOnSizeSet, SWIG_Callback6_t callbackOnSizeAnimation, SWIG_Callback7_t callbackOnTouchEvent, SWIG_Callback8_t callbackOnHoverEvent, SWIG_Callback9_t callbackOnKeyEvent, SWIG_Callback10_t callbackOnWheelEvent, SWIG_Callback11_t callbackOnRelayout, SWIG_Callback12_t callbackOnSetResizePolicy, SWIG_Callback13_t callbackGetNaturalSize, SWIG_Callback14_t callbackCalculateChildSize, SWIG_Callback15_t callbackGetHeightForWidth, SWIG_Callback16_t callbackGetWidthForHeight, SWIG_Callback17_t callbackRelayoutDependentOnChildren__SWIG_0, SWIG_Callback18_t callbackRelayoutDependentOnChildren__SWIG_1, SWIG_Callback19_t callbackOnCalculateRelayoutSize, SWIG_Callback20_t callbackOnLayoutNegotiated, SWIG_Callback21_t callbackOnInitialize, SWIG_Callback24_t callbackOnStyleChange, SWIG_Callback25_t callbackOnAccessibilityActivated, SWIG_Callback26_t callbackOnAccessibilityPan, SWIG_Callback27_t callbackOnAccessibilityTouch, SWIG_Callback28_t callbackOnAccessibilityValueChange, SWIG_Callback29_t callbackOnAccessibilityZoom, SWIG_Callback30_t callbackOnKeyInputFocusGained, SWIG_Callback31_t callbackOnKeyInputFocusLost, SWIG_Callback32_t callbackGetNextKeyboardFocusableActor, SWIG_Callback33_t callbackOnKeyboardFocusChangeCommitted, SWIG_Callback34_t callbackOnKeyboardEnter, SWIG_Callback35_t callbackOnPinch, SWIG_Callback36_t callbackOnPan, SWIG_Callback37_t callbackOnTap, SWIG_Callback38_t callbackOnLongPress, SWIG_Callback39_t callbackSignalConnected, SWIG_Callback40_t callbackSignalDisconnected) {
-  swig_callbackOnStageConnection = callbackOnStageConnection;
-  swig_callbackOnStageDisconnection = callbackOnStageDisconnection;
+void SwigDirector_ViewWrapperImpl::swig_connect_director(SWIG_Callback0_t callbackOnSceneConnection, SWIG_Callback1_t callbackOnSceneDisconnection, SWIG_Callback2_t callbackOnChildAdd, SWIG_Callback3_t callbackOnChildRemove, SWIG_Callback4_t callbackOnPropertySet, SWIG_Callback5_t callbackOnSizeSet, SWIG_Callback6_t callbackOnSizeAnimation, SWIG_Callback7_t callbackOnTouchEvent, SWIG_Callback8_t callbackOnHoverEvent, SWIG_Callback9_t callbackOnKeyEvent, SWIG_Callback10_t callbackOnWheelEvent, SWIG_Callback11_t callbackOnRelayout, SWIG_Callback12_t callbackOnSetResizePolicy, SWIG_Callback13_t callbackGetNaturalSize, SWIG_Callback14_t callbackCalculateChildSize, SWIG_Callback15_t callbackGetHeightForWidth, SWIG_Callback16_t callbackGetWidthForHeight, SWIG_Callback17_t callbackRelayoutDependentOnChildren__SWIG_0, SWIG_Callback18_t callbackRelayoutDependentOnChildren__SWIG_1, SWIG_Callback19_t callbackOnCalculateRelayoutSize, SWIG_Callback20_t callbackOnLayoutNegotiated, SWIG_Callback21_t callbackOnInitialize, SWIG_Callback24_t callbackOnStyleChange, SWIG_Callback25_t callbackOnAccessibilityActivated, SWIG_Callback26_t callbackOnAccessibilityPan, SWIG_Callback27_t callbackOnAccessibilityTouch, SWIG_Callback28_t callbackOnAccessibilityValueChange, SWIG_Callback29_t callbackOnAccessibilityZoom, SWIG_Callback30_t callbackOnKeyInputFocusGained, SWIG_Callback31_t callbackOnKeyInputFocusLost, SWIG_Callback32_t callbackGetNextKeyboardFocusableActor, SWIG_Callback33_t callbackOnKeyboardFocusChangeCommitted, SWIG_Callback34_t callbackOnKeyboardEnter, SWIG_Callback35_t callbackOnPinch, SWIG_Callback36_t callbackOnPan, SWIG_Callback37_t callbackOnTap, SWIG_Callback38_t callbackOnLongPress, SWIG_Callback39_t callbackSignalConnected, SWIG_Callback40_t callbackSignalDisconnected) {
+  swig_callbackOnSceneConnection = callbackOnSceneConnection;
+  swig_callbackOnSceneDisconnection = callbackOnSceneDisconnection;
   swig_callbackOnChildAdd = callbackOnChildAdd;
   swig_callbackOnChildRemove = callbackOnChildRemove;
   swig_callbackOnPropertySet = callbackOnPropertySet;
@@ -490,8 +490,8 @@ void SwigDirector_ViewWrapperImpl::swig_connect_director(SWIG_Callback0_t callba
 }
 
 void SwigDirector_ViewWrapperImpl::swig_init_callbacks() {
-  swig_callbackOnStageConnection = 0;
-  swig_callbackOnStageDisconnection = 0;
+  swig_callbackOnSceneConnection = 0;
+  swig_callbackOnSceneDisconnection = 0;
   swig_callbackOnChildAdd = 0;
   swig_callbackOnChildRemove = 0;
   swig_callbackOnPropertySet = 0;
diff --git a/dali-csharp-binder/src/view-wrapper-impl-wrap.h b/dali-csharp-binder/src/view-wrapper-impl-wrap.h
index 8044c4a..6344cea 100644 (file)
--- a/dali-csharp-binder/src/view-wrapper-impl-wrap.h
+++ b/dali-csharp-binder/src/view-wrapper-impl-wrap.h
@@ -26,15 +26,15 @@ public:
 
     SwigDirector_ViewWrapperImpl(Dali::Toolkit::Internal::ControlWrapper::CustomControlBehaviour behaviourFlags);
     virtual ~SwigDirector_ViewWrapperImpl();
-    virtual void OnStageConnection(int depth);
-    virtual void OnStageConnectionSwigPublic(int depth)
+    virtual void OnSceneConnection(int depth);
+    virtual void OnSceneConnectionSwigPublic(int depth)
     {
-      Dali::Toolkit::Internal::Control::OnStageConnection(depth);
+      Dali::Toolkit::Internal::Control::OnSceneConnection(depth);
     }
-    virtual void OnStageDisconnection();
-    virtual void OnStageDisconnectionSwigPublic()
+    virtual void OnSceneDisconnection();
+    virtual void OnSceneDisconnectionSwigPublic()
     {
-      Dali::Toolkit::Internal::Control::OnStageDisconnection();
+      Dali::Toolkit::Internal::Control::OnSceneDisconnection();
     }
     virtual void OnChildAdd(Dali::Actor &child);
     virtual void OnChildAddSwigPublic(Dali::Actor &child)
@@ -181,11 +181,11 @@ public:
     typedef void (SWIGSTDCALL* SWIG_Callback38_t)(void *);
     typedef void (SWIGSTDCALL* SWIG_Callback39_t)(void *, void *);
     typedef void (SWIGSTDCALL* SWIG_Callback40_t)(void *, void *);
-    void swig_connect_director(SWIG_Callback0_t callbackOnStageConnection, SWIG_Callback1_t callbackOnStageDisconnection, SWIG_Callback2_t callbackOnChildAdd, SWIG_Callback3_t callbackOnChildRemove, SWIG_Callback4_t callbackOnPropertySet, SWIG_Callback5_t callbackOnSizeSet, SWIG_Callback6_t callbackOnSizeAnimation, SWIG_Callback7_t callbackOnTouchEvent, SWIG_Callback8_t callbackOnHoverEvent, SWIG_Callback9_t callbackOnKeyEvent, SWIG_Callback10_t callbackOnWheelEvent, SWIG_Callback11_t callbackOnRelayout, SWIG_Callback12_t callbackOnSetResizePolicy, SWIG_Callback13_t callbackGetNaturalSize, SWIG_Callback14_t callbackCalculateChildSize, SWIG_Callback15_t callbackGetHeightForWidth, SWIG_Callback16_t callbackGetWidthForHeight, SWIG_Callback17_t callbackRelayoutDependentOnChildren__SWIG_0, SWIG_Callback18_t callbackRelayoutDependentOnChildren__SWIG_1, SWIG_Callback19_t callbackOnCalculateRelayoutSize, SWIG_Callback20_t callbackOnLayoutNegotiated, SWIG_Callback21_t callbackOnInitialize, SWIG_Callback24_t callbackOnStyleChange, SWIG_Callback25_t callbackOnAccessibilityActivated, SWIG_Callback26_t callbackOnAccessibilityPan, SWIG_Callback27_t callbackOnAccessibilityTouch, SWIG_Callback28_t callbackOnAccessibilityValueChange, SWIG_Callback29_t callbackOnAccessibilityZoom, SWIG_Callback30_t callbackOnKeyInputFocusGained, SWIG_Callback31_t callbackOnKeyInputFocusLost, SWIG_Callback32_t callbackGetNextKeyboardFocusableActor, SWIG_Callback33_t callbackOnKeyboardFocusChangeCommitted, SWIG_Callback34_t callbackOnKeyboardEnter, SWIG_Callback35_t callbackOnPinch, SWIG_Callback36_t callbackOnPan, SWIG_Callback37_t callbackOnTap, SWIG_Callback38_t callbackOnLongPress, SWIG_Callback39_t callbackSignalConnected, SWIG_Callback40_t callbackSignalDisconnected);
+    void swig_connect_director(SWIG_Callback0_t callbackOnSceneConnection, SWIG_Callback1_t callbackOnSceneDisconnection, SWIG_Callback2_t callbackOnChildAdd, SWIG_Callback3_t callbackOnChildRemove, SWIG_Callback4_t callbackOnPropertySet, SWIG_Callback5_t callbackOnSizeSet, SWIG_Callback6_t callbackOnSizeAnimation, SWIG_Callback7_t callbackOnTouchEvent, SWIG_Callback8_t callbackOnHoverEvent, SWIG_Callback9_t callbackOnKeyEvent, SWIG_Callback10_t callbackOnWheelEvent, SWIG_Callback11_t callbackOnRelayout, SWIG_Callback12_t callbackOnSetResizePolicy, SWIG_Callback13_t callbackGetNaturalSize, SWIG_Callback14_t callbackCalculateChildSize, SWIG_Callback15_t callbackGetHeightForWidth, SWIG_Callback16_t callbackGetWidthForHeight, SWIG_Callback17_t callbackRelayoutDependentOnChildren__SWIG_0, SWIG_Callback18_t callbackRelayoutDependentOnChildren__SWIG_1, SWIG_Callback19_t callbackOnCalculateRelayoutSize, SWIG_Callback20_t callbackOnLayoutNegotiated, SWIG_Callback21_t callbackOnInitialize, SWIG_Callback24_t callbackOnStyleChange, SWIG_Callback25_t callbackOnAccessibilityActivated, SWIG_Callback26_t callbackOnAccessibilityPan, SWIG_Callback27_t callbackOnAccessibilityTouch, SWIG_Callback28_t callbackOnAccessibilityValueChange, SWIG_Callback29_t callbackOnAccessibilityZoom, SWIG_Callback30_t callbackOnKeyInputFocusGained, SWIG_Callback31_t callbackOnKeyInputFocusLost, SWIG_Callback32_t callbackGetNextKeyboardFocusableActor, SWIG_Callback33_t callbackOnKeyboardFocusChangeCommitted, SWIG_Callback34_t callbackOnKeyboardEnter, SWIG_Callback35_t callbackOnPinch, SWIG_Callback36_t callbackOnPan, SWIG_Callback37_t callbackOnTap, SWIG_Callback38_t callbackOnLongPress, SWIG_Callback39_t callbackSignalConnected, SWIG_Callback40_t callbackSignalDisconnected);
 
 private:
-    SWIG_Callback0_t swig_callbackOnStageConnection;
-    SWIG_Callback1_t swig_callbackOnStageDisconnection;
+    SWIG_Callback0_t swig_callbackOnSceneConnection;
+    SWIG_Callback1_t swig_callbackOnSceneDisconnection;
     SWIG_Callback2_t swig_callbackOnChildAdd;
     SWIG_Callback3_t swig_callbackOnChildRemove;
     SWIG_Callback4_t swig_callbackOnPropertySet;
Domain: Graphics System / DALi; Licenses: Apache-2.0;