Changes required after TextLabel Devel properties were made public 47/153947/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 3 Oct 2017 18:07:47 +0000 (19:07 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 3 Oct 2017 18:07:47 +0000 (19:07 +0100)
Change-Id: Iade032ddf04e4bbb00a0d1251491a549c03df5f1

dali-csharp-binder/src/dali_wrap.cpp
dali-csharp-binder/src/devel-property-wrap.cpp

index 06a3717..82a11ac 100755 (executable)
@@ -451,7 +451,6 @@ SWIGINTERN void SWIG_CSharpException(int code, const char *msg) {
 #include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
 #include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h>
 #include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h>
-#include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>
 #include <dali-toolkit/devel-api/controls/buttons/toggle-button.h>
 
 #include <dali-toolkit/devel-api/visual-factory/visual-base.h>
@@ -72637,15 +72636,6 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_TEXT_COLOR_get() {
   return jresult;
 }
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_TEXT_COLOR_ANIMATABLE_get() {
-  int jresult ;
-  int result;
-
-  result = (int)Dali::Toolkit::DevelTextLabel::Property::TEXT_COLOR_ANIMATABLE;
-  jresult = (int)result;
-  return jresult;
-}
-
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_SHADOW_OFFSET_get() {
   int jresult ;
   int result;
index ca2ef40..4d0e183 100755 (executable)
@@ -28,7 +28,6 @@
 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-field-devel.h>
-#include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>
 #include <dali-toolkit/public-api/visuals/visual-properties.h>
 #include <dali-toolkit/devel-api/controls/text-controls/hidden-input-properties.h>
 
@@ -238,7 +237,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_TextLabel_Property_PIXEL_SIZE_get() {
   int jresult ;
   int result;
 
-  result = (int)Dali::Toolkit::DevelTextLabel::Property::PIXEL_SIZE;
+  result = (int)Dali::Toolkit::TextLabel::Property::PIXEL_SIZE;
   jresult = (int)result;
   return jresult;
 }
@@ -247,7 +246,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_TextLabel_Property_ELLIPSIS_get() {
   int jresult ;
   int result;
 
-  result = (int)Dali::Toolkit::DevelTextLabel::Property::ELLIPSIS;
+  result = (int)Dali::Toolkit::TextLabel::Property::ELLIPSIS;
   jresult = (int)result;
   return jresult;
 }
@@ -256,7 +255,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_TextLabel_Property_AUTO_SCROLL_STOP_MODE_get()
   int jresult ;
   int result;
 
-  result = (int)Dali::Toolkit::DevelTextLabel::Property::AUTO_SCROLL_STOP_MODE;
+  result = (int)Dali::Toolkit::TextLabel::Property::AUTO_SCROLL_STOP_MODE;
   jresult = (int)result;
   return jresult;
 }
@@ -265,7 +264,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_TextLabel_Property_AUTO_SCROLL_LOOP_DELAY_get(
   int jresult ;
   int result;
 
-  result = (int)Dali::Toolkit::DevelTextLabel::Property::AUTO_SCROLL_LOOP_DELAY;
+  result = (int)Dali::Toolkit::TextLabel::Property::AUTO_SCROLL_LOOP_DELAY;
   jresult = (int)result;
   return jresult;
 }
@@ -374,7 +373,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_TextLabel_Property_LINE_COUNT_get() {
   int jresult ;
   int result;
 
-  result = (int)Dali::Toolkit::DevelTextLabel::Property::LINE_COUNT;
+  result = (int)Dali::Toolkit::TextLabel::Property::LINE_COUNT;
   jresult = (int)result;
   return jresult;
 }
@@ -383,7 +382,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_TextLabel_Property_LINE_WRAP_MODE_get() {
   int jresult ;
   int result;
 
-  result = (int)Dali::Toolkit::DevelTextLabel::Property::LINE_WRAP_MODE;
+  result = (int)Dali::Toolkit::TextLabel::Property::LINE_WRAP_MODE;
   jresult = (int)result;
   return jresult;
 }