From c7ddfcd2509b63a3a0f99d75d5a60c26fc4e10c8 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Tue, 3 Oct 2017 19:07:47 +0100 Subject: [PATCH] Changes required after TextLabel Devel properties were made public Change-Id: Iade032ddf04e4bbb00a0d1251491a549c03df5f1 --- dali-csharp-binder/src/dali_wrap.cpp | 10 ---------- dali-csharp-binder/src/devel-property-wrap.cpp | 13 ++++++------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/dali-csharp-binder/src/dali_wrap.cpp b/dali-csharp-binder/src/dali_wrap.cpp index 06a3717..82a11ac 100755 --- a/dali-csharp-binder/src/dali_wrap.cpp +++ b/dali-csharp-binder/src/dali_wrap.cpp @@ -451,7 +451,6 @@ SWIGINTERN void SWIG_CSharpException(int code, const char *msg) { #include #include #include -#include #include #include @@ -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; diff --git a/dali-csharp-binder/src/devel-property-wrap.cpp b/dali-csharp-binder/src/devel-property-wrap.cpp index ca2ef40..4d0e183 100755 --- a/dali-csharp-binder/src/devel-property-wrap.cpp +++ b/dali-csharp-binder/src/devel-property-wrap.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -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; } -- 2.7.4