Merge "Add PRIVATECOMMAND of ImfEvent in text-controller" into devel/master

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

diff --git a/plugins/dali-sharp/sharp/internal/ViewRegistry.cs b/plugins/dali-sharp/sharp/internal/ViewRegistry.cs
index a359297..70d5001 100755 (executable)
--- a/plugins/dali-sharp/sharp/internal/ViewRegistry.cs
+++ b/plugins/dali-sharp/sharp/internal/ViewRegistry.cs
@@ -216,7 +216,7 @@ namespace Dali
       {
         // Create the control
         CustomView newControl = controlConstructor ();
-        return newControl.GetPtrfromActor();  // return pointer to handle
+        return newControl.GetPtrfromView();  // return pointer to handle
       }
       else
       {
@@ -287,18 +287,18 @@ namespace Dali
       }
     }
 
-    public static View GetViewFromActor( Actor actor )
+    public static View GetViewFromActor( View view )
     {
       // we store a dictionary of ref-obects (C++ land) to custom views (C# land)
 
-      RefObject refObj = actor.GetObjectPtr ();
+      RefObject refObj = view.GetObjectPtr ();
       IntPtr refObjectPtr = (IntPtr) RefObject.getCPtr(refObj);
 
       WeakReference viewReference;
       if ( Instance._controlMap.TryGetValue ( refObjectPtr, out viewReference) )
       {
-        View view = viewReference.Target as View;
-        return view;
+        View retview = viewReference.Target as View;
+        return retview;
       }
       else
       {