Combined Stage and Window class, and removed Stage class

[platform/core/uifw/dali-toolkit.git] / plugins / dali-sharp / sharp / internal / CustomActor.cs

diff --git a/plugins/dali-sharp/sharp/internal/CustomActor.cs b/plugins/dali-sharp/sharp/internal/CustomActor.cs
index 53eacc2..86b873a 100644 (file)
--- a/plugins/dali-sharp/sharp/internal/CustomActor.cs
+++ b/plugins/dali-sharp/sharp/internal/CustomActor.cs
@@ -10,7 +10,7 @@
 
 namespace Dali {
 
-public class CustomActor : Actor {
+    public class CustomActor : Animatable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal CustomActor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CustomActor_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -25,8 +25,8 @@ public class CustomActor : Actor {
     DisposeQueue.Instance.Add(this);
   }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
+  public virtual void Dispose() {
+    if (!Window.IsInstalled()) {
       DisposeQueue.Instance.Add(this);
       return;
     }
@@ -40,7 +40,6 @@ public class CustomActor : Actor {
         swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
       }
       global::System.GC.SuppressFinalize(this);
-      base.Dispose();
     }
   }