[Tizen] Sync tizen_4.0 branch

Change-Id: I100b3ed27856d1651951d8891af4e23407bfbe6b
Signed-off-by: huiyu,eun <huiyu.eun@samsung.com>

diff --git a/dali-csharp-binder/file.list b/dali-csharp-binder/file.list
index f191d62..97fb764 100755 (executable)
--- a/dali-csharp-binder/file.list
+++ b/dali-csharp-binder/file.list
@@ -15,6 +15,7 @@ dali_csharp_binder_src_files = \
   src/text-field.cpp \
   src/window.cpp \
   src/tts-player.cpp \
+  src/imf-manager.cpp \
   src/input-method-options.cpp \
   src/animation.cpp \
   src/watch.cpp \
@@ -35,6 +36,7 @@ dali_csharp_binder_src_files_tizen = \
   src/text-field.cpp \
   src/window.cpp \
   src/tts-player.cpp \
+  src/imf-manager.cpp \
   src/input-method-options.cpp \
   src/animation.cpp \
   src/key-grab.cpp \

diff --git a/dali-csharp-binder/src/dali_wrap.cpp b/dali-csharp-binder/src/dali_wrap.cpp
index b5b3ff8..882eac4 100755 (executable)
--- a/dali-csharp-binder/src/dali_wrap.cpp
+++ b/dali-csharp-binder/src/dali_wrap.cpp
@@ -50715,8 +50715,8 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_PaddingType__SWIG_1(float jarg1, f
 
   arg1 = (float)jarg1;
   arg2 = (float)jarg2;
-  arg3 = (float)jarg3;
-  arg4 = (float)jarg4;
+  arg3 = (float)jarg4;
+  arg4 = (float)jarg3;
   {
     try {
       result = (Dali::Rect< float > *)new Dali::Rect< float >(arg1,arg2,arg3,arg4);
@@ -50830,8 +50830,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_Set(void * jarg1, float jarg
   arg1 = (Dali::Rect< float > *)jarg1;
   arg2 = (float)jarg2;
   arg3 = (float)jarg3;
-  arg4 = (float)jarg4;
-  arg5 = (float)jarg5;
+  arg4 = (float)jarg5;
+  arg5 = (float)jarg4;
   {
     try {
       (arg1)->Set(arg2,arg3,arg4,arg5);
@@ -50857,28 +50857,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_Set(void * jarg1, float jarg
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_x_set(void * jarg1, float jarg2) {
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
-  float arg2 ;
-
-  arg1 = (Dali::Rect< float > *)jarg1;
-  arg2 = (float)jarg2;
-  if (arg1) (arg1)->x = arg2;
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_x_get(void * jarg1) {
-  float jresult ;
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
-  float result;
-
-  arg1 = (Dali::Rect< float > *)jarg1;
-  result = (float) ((arg1)->x);
-  jresult = result;
-  return jresult;
-}
-
-
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_left_set(void * jarg1, float jarg2) {
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float arg2 ;
@@ -50901,23 +50879,23 @@ SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_left_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_y_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_start_set(void * jarg1, float jarg2) {
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float arg2 ;
 
   arg1 = (Dali::Rect< float > *)jarg1;
   arg2 = (float)jarg2;
-  if (arg1) (arg1)->y = arg2;
+  if (arg1) (arg1)->left = arg2;
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_y_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_start_get(void * jarg1) {
   float jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float result;
 
   arg1 = (Dali::Rect< float > *)jarg1;
-  result = (float) ((arg1)->y);
+  result = (float) ((arg1)->left);
   jresult = result;
   return jresult;
 }
@@ -50945,23 +50923,23 @@ SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_right_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_width_set(void * jarg1, float jarg2) {
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_end_set(void * jarg1, float jarg2) {
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float arg2 ;
 
   arg1 = (Dali::Rect< float > *)jarg1;
   arg2 = (float)jarg2;
-  if (arg1) (arg1)->width = arg2;
+  if (arg1) (arg1)->right = arg2;
 }
 
 
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_width_get(void * jarg1) {
+SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_end_get(void * jarg1) {
   float jresult ;
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float result;
 
   arg1 = (Dali::Rect< float > *)jarg1;
-  result = (float) ((arg1)->width);
+  result = (float) ((arg1)->right);
   jresult = result;
   return jresult;
 }
@@ -50989,28 +50967,6 @@ SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_bottom_get(void * jarg1) {
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_height_set(void * jarg1, float jarg2) {
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
-  float arg2 ;
-
-  arg1 = (Dali::Rect< float > *)jarg1;
-  arg2 = (float)jarg2;
-  if (arg1) (arg1)->height = arg2;
-}
-
-
-SWIGEXPORT float SWIGSTDCALL CSharp_Dali_PaddingType_height_get(void * jarg1) {
-  float jresult ;
-  Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
-  float result;
-
-  arg1 = (Dali::Rect< float > *)jarg1;
-  result = (float) ((arg1)->height);
-  jresult = result;
-  return jresult;
-}
-
-
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_PaddingType_top_set(void * jarg1, float jarg2) {
   Dali::Rect< float > *arg1 = (Dali::Rect< float > *) 0 ;
   float arg2 ;

diff --git a/dali-csharp-binder/src/imf-manager.cpp b/dali-csharp-binder/src/imf-manager.cpp
index 22949a2..45c6f86 100755 (executable)
--- a/dali-csharp-binder/src/imf-manager.cpp
+++ b/dali-csharp-binder/src/imf-manager.cpp
@@ -465,7 +465,8 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ImfManager_Finalize(void * jarg1) {
   arg1 = (Dali::ImfManager *)jarg1;
   {
     try {
-      (arg1)->Finalize();
+      //Need to check, Finalize is deprecated
+      //(arg1)->Finalize();
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
@@ -819,7 +820,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ImfManager_SetInputPanelUserData(void *
   arg2 = &arg2_str;
   {
     try {
-      (arg1)->SetInputPanelUserData((std::string const &)*arg2);
+      (arg1)->SetInputPanelData((std::string const &)*arg2);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
@@ -847,7 +848,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ImfManager_GetInputPanelUserData(void *
 
   {
     try {
-      (arg1)->GetInputPanelUserData(*arg2);
+      (arg1)->GetInputPanelData(*arg2);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;

diff --git a/dali-csharp-binder/src/window.cpp b/dali-csharp-binder/src/window.cpp
index 3700007..ec97122 100755 (executable)
--- a/dali-csharp-binder/src/window.cpp
+++ b/dali-csharp-binder/src/window.cpp
@@ -2511,6 +2511,25 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_FeedKeyEvent(void * jarg1) {
     }
   }
 }
+
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_RenderOnce(void * /* jarg1 */) {
+  try {
+    Dali::Adaptor::Get().RenderOnce();
+  } catch (std::out_of_range& e) {
+    {
+      SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
+    };
+  } catch (std::exception& e) {
+    {
+      SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return ;
+    };
+  } catch (...) {
+    {
+      SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return ;
+    };
+  }
+}
+
 #ifdef __cplusplus
 }
 #endif