Merge "Removed redundant resource loading code" into devel/master

[platform/core/uifw/dali-toolkit.git] / plugins / dali-swig / manual / cpp / devel-property-wrap.cpp

diff --git a/plugins/dali-swig/manual/cpp/devel-property-wrap.cpp b/plugins/dali-swig/manual/cpp/devel-property-wrap.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 8f8940d..4e96f02
--- a/plugins/dali-swig/manual/cpp/devel-property-wrap.cpp
+++ b/plugins/dali-swig/manual/cpp/devel-property-wrap.cpp
@@ -33,38 +33,47 @@
 extern "C" {
 #endif
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Actor_Property_BATCH_PARENT_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_Actor_Property_SIBLING_ORDER_get() {
   int jresult ;
   int result;
 
-  result = (int)Dali::DevelActor::Property::BATCH_PARENT;
+  result = (int)Dali::DevelActor::Property::SIBLING_ORDER;
   jresult = (int)result;
   return jresult;
 }
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Actor_Property_SIBLING_ORDER_get() {
+SWIGEXPORT float SWIGSTDCALL CSharp_Actor_Property_OPACITY_get() {
   int jresult ;
   int result;
 
-  result = (int)Dali::DevelActor::Property::SIBLING_ORDER;
+  result = (float)Dali::DevelActor::Property::OPACITY;
   jresult = (int)result;
   return jresult;
 }
 
-SWIGEXPORT int SWIGSTDCALL CSharp_Renderer_Property_BATCHING_ENABLED_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_View_Property_TOOLTIP_get() {
   int jresult ;
   int result;
 
-  result = (int)Dali::DevelRenderer::Property::BATCHING_ENABLED;
+  result = (int)Dali::Toolkit::DevelControl::Property::TOOLTIP;
   jresult = (int)result;
   return jresult;
 }
 
-SWIGEXPORT int SWIGSTDCALL CSharp_View_Property_TOOLTIP_get() {
+SWIGEXPORT int SWIGSTDCALL CSharp_View_Property_STATE_get() {
   int jresult ;
   int result;
 
-  result = (int)Dali::Toolkit::DevelControl::Property::TOOLTIP;
+  result = (int)Dali::Toolkit::DevelControl::Property::STATE;
+  jresult = (int)result;
+  return jresult;
+}
+
+SWIGEXPORT int SWIGSTDCALL CSharp_View_Property_SUB_STATE_get() {
+  int jresult ;
+  int result;
+
+  result = (int)Dali::Toolkit::DevelControl::Property::SUB_STATE;
   jresult = (int)result;
   return jresult;
 }