Dali C#: sync with dali version upgraded to 1.2.22

Signed-off-by: dongsug.song <dongsug.song@samsung.com>
Change-Id: I6caf91a83c7d58bcecdc5427540655b0dbe7e6cc

diff --git a/dali-csharp-binder/file.list b/dali-csharp-binder/file.list
index 944e538..badac53 100755 (executable)
--- a/dali-csharp-binder/file.list
+++ b/dali-csharp-binder/file.list
@@ -3,10 +3,10 @@
 #
 
 dali_csharp_binder_src_files = \
-  src/dali_wrap.cpp
-#  src/callbackbase_wrap.cpp \
-#  src/keyboard_focus_manager_wrap.cpp \
-#  src/view-wrapper-impl-wrap.cpp 
+  src/dali_wrap.cpp \
+  src/callbackbase_wrap.cpp \
+  src/keyboard_focus_manager_wrap.cpp \
+  src/view-wrapper-impl-wrap.cpp 
 
 dali_csharp_binder_header_files = \
   src/common.h

diff --git a/dali-csharp-binder/src/common.h b/dali-csharp-binder/src/common.h
index 95e91c1..9f8d237 100644 (file)
--- a/dali-csharp-binder/src/common.h
+++ b/dali-csharp-binder/src/common.h
@@ -231,8 +231,7 @@ SWIGINTERN void SWIG_CSharpException(int code, const char *msg)
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
 
-//this should be fixed after tizen branch being upgraded!
-//#include <dali-toolkit/devel-api/controls/control-wrapper.h>
-//#include <dali-toolkit/devel-api/controls/control-wrapper-impl.h>
+#include <dali-toolkit/devel-api/controls/control-wrapper.h>
+#include <dali-toolkit/devel-api/controls/control-wrapper-impl.h>
 
 #endif // CSHARP_COMMON_H

diff --git a/dali-csharp-binder/src/dali_wrap.cpp b/dali-csharp-binder/src/dali_wrap.cpp
index 14bb7ab..6392d1d 100644 (file)
--- a/dali-csharp-binder/src/dali_wrap.cpp
+++ b/dali-csharp-binder/src/dali_wrap.cpp
@@ -452,8 +452,7 @@ SWIGINTERN void SWIG_CSharpException(int code, const char *msg) {
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visual-factory/transition-data.h>
 
-//this should be fixed after tizen branch being upgraded!
-//#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
+#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h>
 
@@ -58159,7 +58158,6 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_PRIMITIVE_VISUAL_LIGHT_POSITION_get() {
   return jresult;
 }
 
-/* this should be fixed after tizen branch being upgraded!
 SWIGEXPORT int SWIGSTDCALL CSharp_NUI_TEXT_get() {
   int jresult ;
   int result;
@@ -58392,7 +58390,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ENABLE_MARKUP_get() {
   jresult = (int)result; 
   return jresult;
 }
-*/
+
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_NUI_new_Builder() {
   void * jresult ;
@@ -69490,7 +69488,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_ItemLayout_GetOrientation(void * jarg1) {
   return jresult;
 }
 
-/* this should be fixed after tizen branch being upgraded!
+
 SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemLayout_SetLayoutProperties(void * jarg1, void * jarg2) {
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
   Dali::Property::Map *arg2 = 0 ;
@@ -69599,7 +69597,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemLayout_ResetLayoutChangedFlag(void *
     }
   }
 }
-*/
+
 
 SWIGEXPORT void SWIGSTDCALL CSharp_NUI_ItemLayout_GetItemSize(void * jarg1, unsigned int jarg2, void * jarg3, void * jarg4) {
   Dali::Toolkit::ItemLayout *arg1 = (Dali::Toolkit::ItemLayout *) 0 ;
@@ -82466,7 +82464,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_POPUP_BACKGROUND_IMAGE_get(
   return jresult;
 }
 
-/* this should be fixed after tizen branch being upgraded!
+
 SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_POPUP_BACKGROUND_BORDER_get() {
   int jresult ;
   int result;
@@ -82475,7 +82473,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_POPUP_BACKGROUND_BORDER_get
   jresult = (int)result; 
   return jresult;
 }
-*/
+
 
 SWIGEXPORT int SWIGSTDCALL CSharp_NUI_Popup_Property_TAIL_UP_IMAGE_get() {
   int jresult ;
@@ -84946,7 +84944,6 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_NUI_VisualBase_GetName(void * jarg1) {
   return jresult;
 }
 
-/* this should be fixed after tizen branch being upgraded!
 SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VisualBase_SetTransformAndSize(void * jarg1, void * jarg2, void * jarg3) {
   Dali::Toolkit::Visual::Base *arg1 = (Dali::Toolkit::Visual::Base *) 0 ;
   Dali::Property::Map *arg2 = 0 ;
@@ -84983,7 +84980,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VisualBase_SetTransformAndSize(void * jar
     }
   }
 }
-*/
+
 
 SWIGEXPORT float SWIGSTDCALL CSharp_NUI_VisualBase_GetHeightForWidth(void * jarg1, float jarg2) {
   float jresult ;
@@ -85014,7 +85011,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_VisualBase_GetHeightForWidth(void * jarg
   return jresult;
 }
 
-/* this should be fixed after tizen branch being upgraded!
+
 SWIGEXPORT float SWIGSTDCALL CSharp_NUI_VisualBase_GetWidthForHeight(void * jarg1, float jarg2) {
   float jresult ;
   Dali::Toolkit::Visual::Base *arg1 = (Dali::Toolkit::Visual::Base *) 0 ;
@@ -85043,7 +85040,7 @@ SWIGEXPORT float SWIGSTDCALL CSharp_NUI_VisualBase_GetWidthForHeight(void * jarg
   jresult = result; 
   return jresult;
 }
-*/
+
 
 SWIGEXPORT void SWIGSTDCALL CSharp_NUI_VisualBase_GetNaturalSize(void * jarg1, void * jarg2) {
   Dali::Toolkit::Visual::Base *arg1 = (Dali::Toolkit::Visual::Base *) 0 ;

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index f9ad62b..e0f9f0e 100755 (executable)
--- a/packaging/dali-csharp-binder.spec
+++ b/packaging/dali-csharp-binder.spec
@@ -1,6 +1,6 @@
 Name: dali-csharp-binder
-Version: 1.2.21
-Release: 20170110
+Version: 1.2.22
+Release: 20170121
 Summary: build dali csharp binder
 License: TO_BE_FILLED_IN
 Group: uifw/graphic