Merge changes I75f2d974,Ib8d53cf7 into devel/master

[platform/core/uifw/dali-toolkit.git] / plugins / dali-swig / SWIG / devel-properties.i

diff --git a/plugins/dali-swig/SWIG/devel-properties.i b/plugins/dali-swig/SWIG/devel-properties.i
old mode 100644 (file)
new mode 100755 (executable)
index 9cd8714..613a656
--- a/plugins/dali-swig/SWIG/devel-properties.i
+++ b/plugins/dali-swig/SWIG/devel-properties.i
@@ -15,29 +15,19 @@
  *
  */
 
-%typemap(cscode) Dali::Actor::Property %{
-  public static readonly int BATCH_PARENT = NDalicManualPINVOKE.Actor_Property_BATCH_PARENT_get();
-  public static readonly int SIBLING_ORDER = NDalicManualPINVOKE.Actor_Property_SIBLING_ORDER_get();
+%pragma(csharp) modulecode=%{
+  public static readonly int VISUAL_PROPERTY_TRANSFORM = NDalicManualPINVOKE.Visual_Property_TRANSFORM_get();
+  public static readonly int VISUAL_PROPERTY_PREMULTIPLIED_ALPHA = NDalicManualPINVOKE.Visual_Property_PREMULTIPLIED_ALPHA_get();
+  public static readonly int VISUAL_PROPERTY_MIX_COLOR = NDalicManualPINVOKE.Visual_Property_MIX_COLOR_get();
 %}
 
-%typemap(cscode) Dali::Renderer::Property %{
-  public static readonly int BATCHING_ENABLED = NDalicManualPINVOKE.Renderer_Property_BATCHING_ENABLED_get();
+%typemap(cscode) Dali::Toolkit::Visual::Type %{
+  ,
+  TEXT
 %}
 
-%typemap(cscode) Dali::Renderer %{
-  public bool BatchingEnabled
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Renderer.Property.BATCHING_ENABLED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.BATCHING_ENABLED, new Dali.Property.Value( value ) );
-    }
-  }
+%typemap(cscode) Dali::Actor::Property %{
+  public static readonly int SIBLING_ORDER = NDalicManualPINVOKE.Actor_Property_SIBLING_ORDER_get();
 %}
 
 %typemap(cscode) Dali::Toolkit::Control::Property %{