From 212977d198f44f3c61046e9abf26a6502762ec47 Mon Sep 17 00:00:00 2001
From: Kimmo Hoikka <kimmo.hoikka@samsung.com>
Date: Tue, 18 Sep 2018 12:02:14 +0100
Subject: [PATCH] Updates needed after encapsulation and harmonizing operators
 for LayoutLength

https://review.tizen.org/gerrit/#/c/189675/

Change-Id: I8d279f314072e984e6a1c1a630eb6f03255850ff
---
 dali-csharp-binder/src/layout-length.cpp        | 442 ++++--------------------
 dali-csharp-binder/src/layout-measure-spec.cpp  |   6 +-
 dali-csharp-binder/src/layout-measured-size.cpp |   4 +-
 dali-csharp-binder/src/layout-size.cpp          | 171 ++-------
 4 files changed, 98 insertions(+), 525 deletions(-)

diff --git a/dali-csharp-binder/src/layout-length.cpp b/dali-csharp-binder/src/layout-length.cpp
index 7836611..c12addd 100755
--- a/dali-csharp-binder/src/layout-length.cpp
+++ b/dali-csharp-binder/src/layout-length.cpp
@@ -23,13 +23,11 @@ extern "C" {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LayoutLength__SWIG_0(int jarg1) {
   void * jresult ;
-  Dali::Toolkit::LayoutLength::IntType arg1 ;
   Dali::Toolkit::LayoutLength *result = 0 ;
 
-  arg1 = (Dali::Toolkit::LayoutLength::IntType)jarg1;
   {
     try {
-      result = (Dali::Toolkit::LayoutLength *)new Dali::Toolkit::LayoutLength(arg1);
+      result = (Dali::Toolkit::LayoutLength *)new Dali::Toolkit::LayoutLength(jarg1);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
@@ -117,298 +115,112 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LayoutLength_Assign(void * jarg1, void
 
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LayoutLength_EqualTo__SWIG_0(void * jarg1, void * jarg2) {
   unsigned int jresult ;
-  Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  Dali::Toolkit::LayoutLength *arg2 = 0 ;
-  bool result;
-
-  arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::LayoutLength const & type is null", 0);
-    return 0;
-  }
+  Dali::Toolkit::LayoutLength* arg1 = (Dali::Toolkit::LayoutLength*) jarg1;
+  Dali::Toolkit::LayoutLength* arg2 = (Dali::Toolkit::LayoutLength*) jarg2;
+  if (!arg2)
   {
-    try {
-      result = (bool)(arg1)->operator ==((Dali::Toolkit::LayoutLength const &)*arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::LayoutLength type is null", 0);
+    return 0;
   }
-  jresult = result;
+  jresult = (*arg1 == *arg2);
   return jresult;
 }
 
-
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LayoutLength_EqualTo__SWIG_1(void * jarg1, int jarg2) {
   unsigned int jresult ;
-  Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType arg2 ;
-  bool result;
+  Dali::Toolkit::LayoutLength* arg1 = (Dali::Toolkit::LayoutLength*) jarg1;
 
-  arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength::IntType)jarg2;
-  {
-    try {
-      result = (bool)(arg1)->operator ==(arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-  jresult = result;
+  jresult = (*arg1 == jarg2);
   return jresult;
 }
 
 
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LayoutLength_NotEqualTo(void * jarg1, void * jarg2) {
   unsigned int jresult ;
-  Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  Dali::Toolkit::LayoutLength *arg2 = 0 ;
-  bool result;
-
-  arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::LayoutLength const & type is null", 0);
-    return 0;
-  }
+  Dali::Toolkit::LayoutLength* arg1 = (Dali::Toolkit::LayoutLength*) jarg1;
+  Dali::Toolkit::LayoutLength* arg2 = (Dali::Toolkit::LayoutLength*) jarg2;
+  if (!arg2)
   {
-    try {
-      result = (bool)(arg1)->operator !=((Dali::Toolkit::LayoutLength const &)*arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::LayoutLength type is null", 0);
+    return 0;
   }
-  jresult = result;
+  jresult = (*arg1 != *arg2);
   return jresult;
 }
 
 
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LayoutLength_LessThan__SWIG_0(void * jarg1, void * jarg2) {
   unsigned int jresult ;
-  Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  Dali::Toolkit::LayoutLength *arg2 = 0 ;
-  bool result;
-
-  arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::LayoutLength const & type is null", 0);
-    return 0;
-  }
+  Dali::Toolkit::LayoutLength* arg1 = (Dali::Toolkit::LayoutLength*) jarg1;
+  Dali::Toolkit::LayoutLength* arg2 = (Dali::Toolkit::LayoutLength*) jarg2;
+  if (!arg2)
   {
-    try {
-      result = (bool)(arg1)->operator <((Dali::Toolkit::LayoutLength const &)*arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::LayoutLength type is null", 0);
+    return 0;
   }
-  jresult = result;
+  jresult = (*arg1 < *arg2);
   return jresult;
 }
 
 
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LayoutLength_GreaterThan__SWIG_0(void * jarg1, void * jarg2) {
   unsigned int jresult ;
-  // Umar:: To do Later///
-  //Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  Dali::Toolkit::LayoutLength *arg2 = 0 ;
-  bool result = false;
-
-  // Umar:: To do Later///
-  //arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::LayoutLength const & type is null", 0);
-    return 0;
-  }
+  Dali::Toolkit::LayoutLength* arg1 = (Dali::Toolkit::LayoutLength*) jarg1;
+  Dali::Toolkit::LayoutLength* arg2 = (Dali::Toolkit::LayoutLength*) jarg2;
+  if (!arg2)
   {
-    try
-    {
-      // Umar:: To do Later///
-      //result = (bool)(arg1)->operator >((Dali::Toolkit::LayoutLength const &)*arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::LayoutLength type is null", 0);
+    return 0;
   }
-  jresult = result;
+  jresult = (*arg1 > *arg2);
   return jresult;
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LayoutLength_Add__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  Dali::Toolkit::LayoutLength *arg2 = 0 ;
-  SwigValueWrapper< Dali::Toolkit::LayoutLength > result;
+  Dali::Toolkit::LayoutLength* arg1 = (Dali::Toolkit::LayoutLength*) jarg1;
+  Dali::Toolkit::LayoutLength* arg2 = (Dali::Toolkit::LayoutLength*) jarg2;
 
-  arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::LayoutLength const & type is null", 0);
-    return 0;
-  }
+  if (!arg2)
   {
-    try {
-      result = (arg1)->operator +((Dali::Toolkit::LayoutLength const &)*arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::LayoutLength type is null", 0);
+    return 0;
   }
-  jresult = new Dali::Toolkit::LayoutLength((const Dali::Toolkit::LayoutLength &)result);
+  jresult = new Dali::Toolkit::LayoutLength( *arg1 + *arg2 );
   return jresult;
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LayoutLength_Add__SWIG_1(void * jarg1, int jarg2) {
   void * jresult ;
-  Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType arg2 ;
-  SwigValueWrapper< Dali::Toolkit::LayoutLength > result;
+  Dali::Toolkit::LayoutLength* arg1 = (Dali::Toolkit::LayoutLength*) jarg1;
 
-  arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength::IntType)jarg2;
-  {
-    try {
-      result = (arg1)->operator +(arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-  jresult = new Dali::Toolkit::LayoutLength((const Dali::Toolkit::LayoutLength &)result);
+  jresult = new Dali::Toolkit::LayoutLength( *arg1 + jarg2 );
   return jresult;
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LayoutLength_Subtract__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  Dali::Toolkit::LayoutLength *arg2 = 0 ;
-  SwigValueWrapper< Dali::Toolkit::LayoutLength > result;
+  Dali::Toolkit::LayoutLength* arg1 = (Dali::Toolkit::LayoutLength*) jarg1;
+  Dali::Toolkit::LayoutLength* arg2 = (Dali::Toolkit::LayoutLength*) jarg2;
 
-  arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::LayoutLength const & type is null", 0);
-    return 0;
-  }
+  if (!arg2)
   {
-    try {
-      result = (arg1)->operator -((Dali::Toolkit::LayoutLength const &)*arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::LayoutLength type is null", 0);
+    return 0;
   }
-  jresult = new Dali::Toolkit::LayoutLength((const Dali::Toolkit::LayoutLength &)result);
+  jresult = new Dali::Toolkit::LayoutLength( *arg1 - *arg2 );
   return jresult;
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LayoutLength_Subtract__SWIG_1(void * jarg1, int jarg2) {
   void * jresult ;
-  Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType arg2 ;
-  SwigValueWrapper< Dali::Toolkit::LayoutLength > result;
+  Dali::Toolkit::LayoutLength* arg1 = (Dali::Toolkit::LayoutLength*) jarg1;
 
-  arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength::IntType)jarg2;
-  {
-    try {
-      result = (arg1)->operator -(arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-  jresult = new Dali::Toolkit::LayoutLength((const Dali::Toolkit::LayoutLength &)result);
+  jresult = new Dali::Toolkit::LayoutLength( *arg1 - jarg2 );
   return jresult;
 }
 
@@ -450,14 +262,12 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LayoutLength_AddAssign__SWIG_0(void *
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LayoutLength_AddAssign__SWIG_1(void * jarg1, int jarg2) {
   void * jresult ;
   Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType arg2 ;
   Dali::Toolkit::LayoutLength *result = 0 ;
 
   arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength::IntType)jarg2;
   {
     try {
-      result = (Dali::Toolkit::LayoutLength *) &(arg1)->operator +=(arg2);
+      result = (Dali::Toolkit::LayoutLength *) &(arg1)->operator +=(jarg2);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
@@ -514,14 +324,12 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LayoutLength_SubtractAssign__SWIG_0(vo
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LayoutLength_SubtractAssign__SWIG_1(void * jarg1, int jarg2) {
   void * jresult ;
   Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType arg2 ;
   Dali::Toolkit::LayoutLength *result = 0 ;
 
   arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength::IntType)jarg2;
   {
     try {
-      result = (Dali::Toolkit::LayoutLength *) &(arg1)->operator -=(arg2);
+      result = (Dali::Toolkit::LayoutLength *) &(arg1)->operator -=(jarg2);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
@@ -543,181 +351,71 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LayoutLength_SubtractAssign__SWIG_1(vo
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LayoutLength_Divide__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  Dali::Toolkit::LayoutLength *arg2 = 0 ;
-  SwigValueWrapper< Dali::Toolkit::LayoutLength > result;
+  Dali::Toolkit::LayoutLength* arg1 = (Dali::Toolkit::LayoutLength*) jarg1;
+  Dali::Toolkit::LayoutLength* arg2 = (Dali::Toolkit::LayoutLength*) jarg2;
 
-  arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::LayoutLength const & type is null", 0);
-    return 0;
-  }
+  if (!arg2)
   {
-    try {
-      result = (arg1)->operator /((Dali::Toolkit::LayoutLength const &)*arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::LayoutLength type is null", 0);
+    return 0;
   }
-  jresult = new Dali::Toolkit::LayoutLength((const Dali::Toolkit::LayoutLength &)result);
+
+  jresult = new Dali::Toolkit::LayoutLength( *arg1 / arg2->AsDecimal() );
   return jresult;
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LayoutLength_Divide__SWIG_1(void * jarg1, int jarg2) {
   void * jresult ;
-  Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType arg2 ;
-  SwigValueWrapper< Dali::Toolkit::LayoutLength > result;
+  Dali::Toolkit::LayoutLength* arg1 = (Dali::Toolkit::LayoutLength*) jarg1;
 
-  arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength::IntType)jarg2;
-  {
-    try {
-      result = (arg1)->operator /(arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-  jresult = new Dali::Toolkit::LayoutLength((const Dali::Toolkit::LayoutLength &)result);
+  jresult = new Dali::Toolkit::LayoutLength( *arg1 / jarg2 );
   return jresult;
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LayoutLength_Multiply__SWIG_0(void * jarg1, void * jarg2) {
   void * jresult ;
-  Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  Dali::Toolkit::LayoutLength *arg2 = 0 ;
-  SwigValueWrapper< Dali::Toolkit::LayoutLength > result;
+  Dali::Toolkit::LayoutLength* arg1 = (Dali::Toolkit::LayoutLength*) jarg1;
+  Dali::Toolkit::LayoutLength* arg2 = (Dali::Toolkit::LayoutLength*) jarg2;
 
-  arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::LayoutLength const & type is null", 0);
-    return 0;
-  }
+  if (!arg2)
   {
-    try {
-      result = (arg1)->operator *((Dali::Toolkit::LayoutLength const &)*arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::LayoutLength type is null", 0);
+    return 0;
   }
-  jresult = new Dali::Toolkit::LayoutLength((const Dali::Toolkit::LayoutLength &)result);
+  jresult = new Dali::Toolkit::LayoutLength( *arg1 * *arg2 );
   return jresult;
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LayoutLength_Multiply__SWIG_1(void * jarg1, int jarg2) {
   void * jresult ;
-  Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType arg2 ;
-  SwigValueWrapper< Dali::Toolkit::LayoutLength > result;
-
-  arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength::IntType)jarg2;
-  {
-    try {
-      result = (arg1)->operator *(arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-  jresult = new Dali::Toolkit::LayoutLength((const Dali::Toolkit::LayoutLength &)result);
+  Dali::Toolkit::LayoutLength* arg1 = (Dali::Toolkit::LayoutLength*) jarg1;
+  jresult = new Dali::Toolkit::LayoutLength( *arg1 * jarg2 );
   return jresult;
 }
 
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LayoutLength_Multiply__SWIG_2(void * jarg1, float jarg2) {
   void * jresult ;
-  Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  float arg2 ;
-  SwigValueWrapper< Dali::Toolkit::LayoutLength > result;
-
-  arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  arg2 = (float)jarg2;
-  {
-    try {
-      result = (arg1)->operator *(arg2);
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-  jresult = new Dali::Toolkit::LayoutLength((const Dali::Toolkit::LayoutLength &)result);
+  Dali::Toolkit::LayoutLength* arg1 = (Dali::Toolkit::LayoutLength*) jarg1;
+  float arg2( jarg2 );
+  jresult = new Dali::Toolkit::LayoutLength( *arg1 * arg2 );
   return jresult;
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LayoutLength_mValue_set(void * jarg1, int jarg2) {
-  Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType arg2 ;
-
-  arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength::IntType)jarg2;
-  if (arg1) (arg1)->mValue = arg2;
+  Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
+  Dali::Toolkit::LayoutLength arg2( jarg2 );
+  if (arg1) *arg1 = arg2;
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LayoutLength_mValue_get(void * jarg1) {
-  int jresult ;
-  Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType result;
-
-  arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
-  result = (Dali::Toolkit::LayoutLength::IntType) ((arg1)->mValue);
-  jresult = result;
-  return jresult;
+  Dali::Toolkit::LayoutLength *arg1 = (Dali::Toolkit::LayoutLength *)jarg1;
+  return (int) (arg1)->AsInteger();
 }
 
 
diff --git a/dali-csharp-binder/src/layout-measure-spec.cpp b/dali-csharp-binder/src/layout-measure-spec.cpp
index 15898f9..69b6e7d 100755
--- a/dali-csharp-binder/src/layout-measure-spec.cpp
+++ b/dali-csharp-binder/src/layout-measure-spec.cpp
@@ -262,7 +262,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_MeasureSpec_GetSize(void * jarg1) {
       };
     }
   }
-  jresult = result.mValue;
+  jresult = result.AsInteger();
   return jresult;
 }
 
@@ -304,7 +304,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_MeasureSpec_Adjust(void * jarg1, int j
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_MeasureSpec_mSize_set(void * jarg1, int jarg2) {
-  Dali::Toolkit::MeasureSpec *arg1 = (Dali::Toolkit::MeasureSpec *)jarg1;
+  Dali::Toolkit::MeasureSpec *arg1 = (Dali::Toolkit::MeasureSpec *) jarg1;
   Dali::Toolkit::LayoutLength arg2( jarg2 );
   if (arg1) (arg1)->SetSize( arg2 );
 }
@@ -316,7 +316,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_MeasureSpec_mSize_get(void * jarg1) {
 
   arg1 = (Dali::Toolkit::MeasureSpec *)jarg1;
   Dali::Toolkit::LayoutLength result((arg1)->GetSize());
-  jresult = result.mValue;
+  jresult = result.AsInteger();
   return jresult;
 }
 
diff --git a/dali-csharp-binder/src/layout-measured-size.cpp b/dali-csharp-binder/src/layout-measured-size.cpp
index 697d7a5..f4d880f 100755
--- a/dali-csharp-binder/src/layout-measured-size.cpp
+++ b/dali-csharp-binder/src/layout-measured-size.cpp
@@ -184,15 +184,13 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_MeasuredSize_Assign__SWIG_1(void * jar
 {
   void * jresult ;
   Dali::Toolkit::MeasuredSize *arg1 = (Dali::Toolkit::MeasuredSize *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType arg2 ;
   Dali::Toolkit::MeasuredSize *result = 0 ;
 
   arg1 = (Dali::Toolkit::MeasuredSize *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength::IntType)jarg2;
 
   try
   {
-    result = (Dali::Toolkit::MeasuredSize *) &(arg1)->operator =(arg2);
+    result = (Dali::Toolkit::MeasuredSize *) &(arg1)->operator =(jarg2);
   }
   catch (std::out_of_range& e)
   {
diff --git a/dali-csharp-binder/src/layout-size.cpp b/dali-csharp-binder/src/layout-size.cpp
index 1f06cfe..de644a8 100755
--- a/dali-csharp-binder/src/layout-size.cpp
+++ b/dali-csharp-binder/src/layout-size.cpp
@@ -51,15 +51,11 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LayoutSize__SWIG_0() {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_LayoutSize__SWIG_1(int jarg1, int jarg2) {
   void * jresult ;
-  Dali::Toolkit::LayoutLength::IntType arg1 ;
-  Dali::Toolkit::LayoutLength::IntType arg2 ;
   Dali::Toolkit::LayoutSize *result = 0 ;
 
-  arg1 = (Dali::Toolkit::LayoutLength::IntType)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength::IntType)jarg2;
   {
     try {
-      result = (Dali::Toolkit::LayoutSize *)new Dali::Toolkit::LayoutSize(arg1,arg2);
+      result = (Dali::Toolkit::LayoutSize *)new Dali::Toolkit::LayoutSize(jarg1,jarg2);
     } catch (std::out_of_range& e) {
       {
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
@@ -146,110 +142,26 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_LayoutSize_Assign(void * jarg1, void *
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LayoutSize_GetWidth(void * jarg1) {
-  int jresult ;
-  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType result;
-
-  arg1 = (Dali::Toolkit::LayoutSize *)jarg1;
-  {
-    try {
-      result = (Dali::Toolkit::LayoutLength::IntType)(arg1)->GetWidth();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-  jresult = result;
-  return jresult;
+  Dali::Toolkit::LayoutSize* arg1 = (Dali::Toolkit::LayoutSize *) jarg1;
+  return (int)(arg1)->GetWidth().AsInteger();
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LayoutSize_GetHeight(void * jarg1) {
-  int jresult ;
-  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType result;
-
-  arg1 = (Dali::Toolkit::LayoutSize *)jarg1;
-  {
-    try {
-      result = (Dali::Toolkit::LayoutLength::IntType)(arg1)->GetHeight();
-    } catch (std::out_of_range& e) {
-      {
-        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (std::exception& e) {
-      {
-        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
-      };
-    } catch (...) {
-      {
-        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
-      };
-    }
-  }
-  jresult = result;
-  return jresult;
+  Dali::Toolkit::LayoutSize* arg1 = (Dali::Toolkit::LayoutSize *) jarg1;
+  return (int)(arg1)->GetHeight().AsInteger();
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LayoutSize_SetWidth__SWIG_0(void * jarg1, int jarg2) {
-  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType arg2 ;
-
-  arg1 = (Dali::Toolkit::LayoutSize *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength::IntType)jarg2;
-  {
-    try {
-      (arg1)->SetWidth(arg2);
-    } 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 ;
-      };
-    }
-  }
+  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *)jarg1;
+  (arg1)->SetWidth(jarg2);
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LayoutSize_SetHeight__SWIG_0(void * jarg1, int jarg2) {
-  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType arg2 ;
-
-  arg1 = (Dali::Toolkit::LayoutSize *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength::IntType)jarg2;
-  {
-    try {
-      (arg1)->SetHeight(arg2);
-    } 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 ;
-      };
-    }
-  }
+  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *)jarg1;
+  (arg1)->SetHeight(jarg2);
 }
 
 
@@ -353,89 +265,54 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_LayoutSize_EqualTo(void * jarg1,
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LayoutSize_x_set(void * jarg1, int jarg2) {
   Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType arg2 ;
 
   arg1 = (Dali::Toolkit::LayoutSize *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength::IntType)jarg2;
-  if (arg1) (arg1)->x = arg2;
+  if (arg1) (arg1)->x = jarg2;
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LayoutSize_x_get(void * jarg1) {
-  int jresult ;
-  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType result;
-
-  arg1 = (Dali::Toolkit::LayoutSize *)jarg1;
-  result = (Dali::Toolkit::LayoutLength::IntType) ((arg1)->x);
-  jresult = result;
-  return jresult;
+  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) jarg1;
+  return (int) ((arg1)->x.AsInteger());
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LayoutSize_width_set(void * jarg1, int jarg2) {
-  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType arg2 ;
+  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) jarg1;
 
-  arg1 = (Dali::Toolkit::LayoutSize *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength::IntType)jarg2;
-  if (arg1) (arg1)->width = arg2;
+  if (arg1) (arg1)->width = jarg2;
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LayoutSize_width_get(void * jarg1) {
-  int jresult ;
-  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType result;
-
-  arg1 = (Dali::Toolkit::LayoutSize *)jarg1;
-  result = (Dali::Toolkit::LayoutLength::IntType) ((arg1)->width);
-  jresult = result;
-  return jresult;
+  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) jarg1;
+  return (int) ((arg1)->width.AsInteger());
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LayoutSize_y_set(void * jarg1, int jarg2) {
-  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType arg2 ;
+  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) jarg1;
 
-  arg1 = (Dali::Toolkit::LayoutSize *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength::IntType)jarg2;
-  if (arg1) (arg1)->y = arg2;
+  if (arg1) (arg1)->y = jarg2;
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LayoutSize_y_get(void * jarg1) {
-  int jresult ;
-  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType result;
-
-  arg1 = (Dali::Toolkit::LayoutSize *)jarg1;
-  result = (Dali::Toolkit::LayoutLength::IntType) ((arg1)->y);
-  jresult = result;
-  return jresult;
+  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) jarg1;
+  return (int) ((arg1)->x.AsInteger());
 }
 
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LayoutSize_height_set(void * jarg1, int jarg2) {
-  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType arg2 ;
+  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) jarg1;
 
-  arg1 = (Dali::Toolkit::LayoutSize *)jarg1;
-  arg2 = (Dali::Toolkit::LayoutLength::IntType)jarg2;
-  if (arg1) (arg1)->height = arg2;
+  if (arg1) (arg1)->height = jarg2;
 }
 
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_LayoutSize_height_get(void * jarg1) {
-  int jresult ;
-  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) 0 ;
-  Dali::Toolkit::LayoutLength::IntType result;
-
-  arg1 = (Dali::Toolkit::LayoutSize *)jarg1;
-  result = (Dali::Toolkit::LayoutLength::IntType) ((arg1)->height);
-  jresult = result;
-  return jresult;
+  Dali::Toolkit::LayoutSize *arg1 = (Dali::Toolkit::LayoutSize *) jarg1;
+  return (int) ((arg1)->height.AsInteger());
 }
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_LayoutSize(void * jarg1) {
-- 
2.7.4