[NUI]Remove some unused APIs.

Change-Id: I583fdb9e000bc906745d8c650465923e6fa9b9ab
Signed-off-by: Feng Jin <feng16.jin@samsung.com>

diff --git a/src/Tizen.NUI/src/internal/ActivatedSignalType.cs b/src/Tizen.NUI/src/internal/ActivatedSignalType.cs
index e15df28..d7191c1 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ActivatedSignalType.cs
+++ b/src/Tizen.NUI/src/internal/ActivatedSignalType.cs
@@ -20,13 +20,7 @@ using System.ComponentModel;
 
 namespace Tizen.NUI
 {
-    /// <summary>
-    /// Please do not use! this will be deprecated
-    /// </summary>
-    /// <since_tizen> 3 </since_tizen>
-    [Obsolete("Please do not use! This will be deprecated!")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class ActivatedSignalType : global::System.IDisposable
+    internal class ActivatedSignalType : global::System.IDisposable
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
         /// <summary>

diff --git a/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs b/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs
index 9f601ae..a321300 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs
+++ b/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs
@@ -20,13 +20,7 @@ using System.ComponentModel;
 
 namespace Tizen.NUI
 {
-    /// <summary>
-    /// Please do not use! this will be deprecated
-    /// </summary>
-    /// <since_tizen> 4 </since_tizen>
-    [Obsolete("Please do not use! This will be deprecated!")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class ConnectionTrackerInterface : SignalObserver
+    internal class ConnectionTrackerInterface : SignalObserver
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 

diff --git a/src/Tizen.NUI/src/internal/ImfEventSignalType.cs b/src/Tizen.NUI/src/internal/ImfEventSignalType.cs
index 8726e02..a8702e2 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ImfEventSignalType.cs
+++ b/src/Tizen.NUI/src/internal/ImfEventSignalType.cs
@@ -20,13 +20,7 @@ using System.ComponentModel;
 
 namespace Tizen.NUI
 {
-    /// <summary>
-    /// Please do not use! this will be deprecated
-    /// </summary>
-    /// <since_tizen> 3 </since_tizen>
-    [Obsolete("Please do not use! This will be deprecated!")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class ImfEventSignalType : global::System.IDisposable
+    internal class ImfEventSignalType : global::System.IDisposable
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
         /// <summary>

diff --git a/src/Tizen.NUI/src/internal/ImfVoidSignalType.cs b/src/Tizen.NUI/src/internal/ImfVoidSignalType.cs
deleted file mode 100755 (executable)
index 97bf8c9..0000000
--- a/src/Tizen.NUI/src/internal/ImfVoidSignalType.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright(c) 2017 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-using System;
-using System.Runtime.InteropServices;
-using System.ComponentModel;
-
-namespace Tizen.NUI
-{
-    /// <summary>
-    /// Please do not use! this will be deprecated
-    /// </summary>
-    /// <since_tizen> 3 </since_tizen>
-    [Obsolete("Please do not use! This will be deprecated!")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class ImfVoidSignalType : global::System.IDisposable
-    {
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-        /// <summary>
-        /// swigCMemOwn
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        protected bool swigCMemOwn;
-
-        internal ImfVoidSignalType(global::System.IntPtr cPtr, bool cMemoryOwn)
-        {
-            swigCMemOwn = cMemoryOwn;
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-        }
-
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ImfVoidSignalType obj)
-        {
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-        }
-
-        //A Flag to check who called Dispose(). (By User or DisposeQueue)
-        private bool isDisposeQueued = false;
-        /// <summary>
-        /// A Flat to check if it is already disposed.
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        protected bool disposed = false;
-
-        /// <summary>
-        /// Dispose
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        ~ImfVoidSignalType()
-        {
-            if (!isDisposeQueued)
-            {
-                isDisposeQueued = true;
-                DisposeQueue.Instance.Add(this);
-            }
-        }
-
-        /// <summary>
-        /// Dispose
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        public void Dispose()
-        {
-            //Throw excpetion if Dispose() is called in separate thread.
-            if (!Window.IsInstalled())
-            {
-                throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread.");
-            }
-
-            if (isDisposeQueued)
-            {
-                Dispose(DisposeTypes.Implicit);
-            }
-            else
-            {
-                Dispose(DisposeTypes.Explicit);
-                System.GC.SuppressFinalize(this);
-            }
-        }
-
-        /// <summary>
-        /// Dispose
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        protected virtual void Dispose(DisposeTypes type)
-        {
-            if (disposed)
-            {
-                return;
-            }
-
-            if (type == DisposeTypes.Explicit)
-            {
-                //Called by User
-                //Release your own managed resources here.
-                //You should release all of your own disposable objects here.
-
-            }
-
-            //Release your own unmanaged resources here.
-            //You should not access any managed member here except static instance.
-            //because the execution order of Finalizes is non-deterministic.
-
-            if (swigCPtr.Handle != global::System.IntPtr.Zero)
-            {
-                if (swigCMemOwn)
-                {
-                    swigCMemOwn = false;
-                    NDalicManualPINVOKE.delete_ImfVoidSignalType(swigCPtr);
-                }
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-            }
-
-            disposed = true;
-        }
-
-        /// <summary>
-        /// The contructor.
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        public ImfVoidSignalType() : this(NDalicManualPINVOKE.new_ImfVoidSignalType(), true)
-        {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Queries whether there are any connected slots.
-        /// </summary>
-        /// <returns>True if there are any slots connected to the signal</returns>
-        /// <since_tizen> 3 </since_tizen>
-        public bool Empty()
-        {
-            bool ret = NDalicManualPINVOKE.ImfVoidSignalType_Empty(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Queries the number of slots.
-        /// </summary>
-        /// <returns>The number of slots connected to this signal</returns>
-        /// <since_tizen> 3 </since_tizen>
-        public uint GetConnectionCount()
-        {
-            uint ret = NDalicManualPINVOKE.ImfVoidSignalType_GetConnectionCount(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// Connects a function.
-        /// </summary>
-        /// <param name="func">The function to connect</param>
-        /// <since_tizen> 3 </since_tizen>
-        public void Connect(System.Delegate func)
-        {
-            System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate<System.Delegate>(func);
-            {
-                NDalicManualPINVOKE.ImfVoidSignalType_Connect__SWIG_0(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            }
-        }
-
-        /// <summary>
-        /// Disconnects a function.
-        /// </summary>
-        /// <param name="func">The function to disconnect</param>
-        /// <since_tizen> 3 </since_tizen>
-        public void Disconnect(System.Delegate func)
-        {
-            System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate<System.Delegate>(func);
-            {
-                NDalicManualPINVOKE.ImfVoidSignalType_Disconnect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            }
-        }
-        /// <summary>
-        /// Connects a member function.
-        /// </summary>
-        /// <param name="connectionTracker">An object which must implement the ConnectionTrackerInterface</param>
-        /// <param name="arg1">The member function to connect</param>
-        /// <since_tizen> 4 </since_tizen>
-        public void Connect(ConnectionTrackerInterface connectionTracker, SWIGTYPE_p_Dali__FunctorDelegate arg1)
-        {
-            NDalicManualPINVOKE.ImfVoidSignalType_Connect__SWIG_4(swigCPtr, ConnectionTrackerInterface.getCPtr(connectionTracker), SWIGTYPE_p_Dali__FunctorDelegate.getCPtr(arg1));
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Emits the signal.
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        public void Emit()
-        {
-            NDalicManualPINVOKE.ImfVoidSignalType_Emit(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-    }
-
-}

diff --git a/src/Tizen.NUI/src/internal/KeyboardResizedSignalType.cs b/src/Tizen.NUI/src/internal/KeyboardResizedSignalType.cs
index 41b4c18..b43d6cc 100755 (executable)
--- a/src/Tizen.NUI/src/internal/KeyboardResizedSignalType.cs
+++ b/src/Tizen.NUI/src/internal/KeyboardResizedSignalType.cs
@@ -20,13 +20,7 @@ using System.ComponentModel;
 
 namespace Tizen.NUI
 {
-    /// <summary>
-    /// Please do not use! this will be deprecated
-    /// </summary>
-    /// <since_tizen> 4 </since_tizen>
-    [Obsolete("Please do not use! This will be deprecated!")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class KeyboardResizedSignalType : global::System.IDisposable
+    internal class KeyboardResizedSignalType : global::System.IDisposable
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
         /// <summary>

diff --git a/src/Tizen.NUI/src/internal/LanguageChangedSignalType.cs b/src/Tizen.NUI/src/internal/LanguageChangedSignalType.cs
index aca37ea..b2dc323 100755 (executable)
--- a/src/Tizen.NUI/src/internal/LanguageChangedSignalType.cs
+++ b/src/Tizen.NUI/src/internal/LanguageChangedSignalType.cs
@@ -20,13 +20,7 @@ using System.ComponentModel;
 
 namespace Tizen.NUI
 {
-    /// <summary>
-    /// Please do not use! this will be deprecated
-    /// </summary>
-    /// <since_tizen> 4 </since_tizen>
-    [Obsolete("Please do not use! This will be deprecated!")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class LanguageChangedSignalType : global::System.IDisposable
+    internal class LanguageChangedSignalType : global::System.IDisposable
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
         /// <summary>

diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_CallbackBase.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_CallbackBase.cs
index 6fe4a73..ff1c2a8 100755 (executable)
--- a/src/Tizen.NUI/src/internal/SWIGTYPE_p_CallbackBase.cs
+++ b/src/Tizen.NUI/src/internal/SWIGTYPE_p_CallbackBase.cs
@@ -13,13 +13,7 @@ using System.ComponentModel;
 
 namespace Tizen.NUI
 {
-    /// <summary>
-    /// This should be internal, please do not use.
-    /// </summary>
-    /// <since_tizen> 4 </since_tizen>
-    [Obsolete("Please do not use! This will be deprecated!")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class SWIGTYPE_p_CallbackBase
+    internal class SWIGTYPE_p_CallbackBase
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 

diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__CallbackBase.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__CallbackBase.cs
index 9896aa3..4909b41 100755 (executable)
--- a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__CallbackBase.cs
+++ b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__CallbackBase.cs
@@ -13,13 +13,7 @@ using System.ComponentModel;
 
 namespace Tizen.NUI
 {
-    /// <summary>
-    /// This should be internal, please do not use.
-    /// </summary>
-    /// <since_tizen> 4 </since_tizen>
-    [Obsolete("Please do not use! This will be deprecated!")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class SWIGTYPE_p_Dali__CallbackBase
+    internal class SWIGTYPE_p_Dali__CallbackBase
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 

diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__FunctorDelegate.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__FunctorDelegate.cs
index 3dcd4cf..a820f4a 100755 (executable)
--- a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__FunctorDelegate.cs
+++ b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__FunctorDelegate.cs
@@ -13,13 +13,7 @@ using System.ComponentModel;
 
 namespace Tizen.NUI
 {
-    /// <summary>
-    /// This should be internal, please do not use.
-    /// </summary>
-    /// <since_tizen> 4 </since_tizen>
-    [Obsolete("Please do not use! This will be deprecated!")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class SWIGTYPE_p_Dali__FunctorDelegate
+    internal class SWIGTYPE_p_Dali__FunctorDelegate
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 

diff --git a/src/Tizen.NUI/src/internal/SignalObserver.cs b/src/Tizen.NUI/src/internal/SignalObserver.cs
index dce29d4..c8b27ce 100755 (executable)
--- a/src/Tizen.NUI/src/internal/SignalObserver.cs
+++ b/src/Tizen.NUI/src/internal/SignalObserver.cs
@@ -21,13 +21,7 @@ using System.ComponentModel;
 
 namespace Tizen.NUI
 {
-    /// <summary>
-    /// Please do not use! this will be deprecated
-    /// </summary>
-    /// <since_tizen> 4 </since_tizen>
-    [Obsolete("Please do not use! This will be deprecated!")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class SignalObserver : global::System.IDisposable
+    internal class SignalObserver : global::System.IDisposable
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
         /// <summary>

diff --git a/src/Tizen.NUI/src/internal/SlotObserver.cs b/src/Tizen.NUI/src/internal/SlotObserver.cs
index 5435c05..b765924 100755 (executable)
--- a/src/Tizen.NUI/src/internal/SlotObserver.cs
+++ b/src/Tizen.NUI/src/internal/SlotObserver.cs
@@ -20,15 +20,7 @@ using System.ComponentModel;
 
 namespace Tizen.NUI
 {
-    //Please do not use! this will be internal
-    /// <summary>
-    /// Abstract Interface used by a slot to inform a signal it is disconnecting.<br />
-    /// This is used by the slot if wants to disconnect or is deleted.<br />
-    /// </summary>
-    /// <since_tizen> 4 </since_tizen>
-    [Obsolete("Please do not use! This will be deprecated!")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class SlotObserver : global::System.IDisposable
+    internal class SlotObserver : global::System.IDisposable
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
         /// <summary>swigCMemOwn.</summary>

diff --git a/src/Tizen.NUI/src/internal/StatusSignalType.cs b/src/Tizen.NUI/src/internal/StatusSignalType.cs
index 91302d1..90864d5 100755 (executable)
--- a/src/Tizen.NUI/src/internal/StatusSignalType.cs
+++ b/src/Tizen.NUI/src/internal/StatusSignalType.cs
@@ -20,13 +20,7 @@ using System.ComponentModel;
 
 namespace Tizen.NUI
 {
-    /// <summary>
-    /// Please do not use! this will be deprecated
-    /// </summary>
-    /// <since_tizen> 3 </since_tizen>
-    [Obsolete("Please do not use! This will be deprecated!")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class StatusSignalType : global::System.IDisposable
+    internal class StatusSignalType : global::System.IDisposable
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
         /// <summary>

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
index 3641ddb..84f4b62 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
@@ -193,24 +193,6 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Downcasts a handle to imageView handle.
-        /// </summary>
-        /// Please do not use! this will be deprecated!
-        /// Instead please use as keyword.
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated! Please use as keyword instead! " +
-            "Like: " +
-            "BaseHandle handle = new ImageView(imagePath); " +
-            "ImageView image = handle as ImageView")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public new static ImageView DownCast(BaseHandle handle)
-        {
-            ImageView ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as ImageView;
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
         /// Sets this ImageView from the given URL.<br />
         /// If the URL is empty, ImageView will not display anything.<br />
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
index 14ab512..2cc141b 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
@@ -139,27 +139,6 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// Downcasts a handle to textLabel handle
-        /// </summary>
-        /// <param name="handle"></param>
-        /// <returns></returns>
-        /// <since_tizen> 3 </since_tizen>
-        /// Please do not use! this will be deprecated!
-        /// Instead please use as keyword.
-        [Obsolete("Please do not use! This will be deprecated! Please use as keyword instead! " +
-            "Like: " +
-            "BaseHandle handle = new TextLabel(\"Hello World!\"); " +
-            "TextLabel label = handle as TextLabel")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public new static TextLabel DownCast(BaseHandle handle)
-        {
-            TextLabel ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as TextLabel;
-
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
         /// The TranslatableText property.<br />
         /// The text can set the SID value.<br />
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs
index c8ebfd4..37d437e 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -1154,39 +1154,6 @@ namespace Tizen.NUI.BaseComponents
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /// <summary>
-        /// Downcasts a handle to view handle.<br />
-        /// If handle points to a view, the downcast produces a valid handle.<br />
-        /// If not, the returned handle is left uninitialized.<br />
-        /// </summary>
-        /// <param name="handle">A handle to an object.</param>
-        /// <returns>A handle to a view or an uninitialized handle.</returns>
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated! Please use as keyword instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static View DownCast(BaseHandle handle)
-        {
-            View ret =  Registry.GetManagedBaseHandleFromNativePtr(handle) as View;
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        /// <summary>
-        /// [Obsolete("Please do not use! this will be deprecated, instead please use as keyword.")]
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated! Please use as keyword instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static T DownCast<T>(View view) where T : View
-        {
-            T ret = Registry.GetManagedBaseHandleFromNativePtr(view) as T;
-            if (ret != null)
-            {
-                return ret;
-            }
-            return null;
-        }
-
         private View ConvertIdToView(uint id)
         {
             View view = null;
@@ -4233,103 +4200,6 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// [Obsolete("Please do not use! this will be deprecated")]
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        /// Please do not use! this will be deprecated!
-        /// Instead please use AddedToWindow.
-        [Obsolete("Please do not use! This will be deprecated! Please use AddedToWindow instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public event EventHandler OnWindowEvent
-        {
-            add
-            {
-                if (_onWindowEventHandler == null)
-                {
-                    _onWindowEventCallback = OnWindow;
-                    this.OnWindowSignal().Connect(_onWindowEventCallback);
-                }
-
-                _onWindowEventHandler += value;
-            }
-
-            remove
-            {
-                _onWindowEventHandler -= value;
-
-                if (_onWindowEventHandler == null && OnWindowSignal().Empty() == false)
-                {
-                    this.OnWindowSignal().Disconnect(_onWindowEventCallback);
-                }
-            }
-        }
-
-        /// <summary>
-        /// [Obsolete("Please do not use! this will be deprecated")]
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        /// Please do not use! this will be deprecated!
-        /// Instead please use RemovedFromWindow.
-        [Obsolete("Please do not use! This will be deprecated! Please use RemovedFromWindow instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public event EventHandler OffWindowEvent
-        {
-            add
-            {
-                if (_offWindowEventHandler == null)
-                {
-                    _offWindowEventCallback = OffWindow;
-                    this.OffWindowSignal().Connect(_offWindowEventCallback);
-                }
-
-                _offWindowEventHandler += value;
-            }
-
-            remove
-            {
-                _offWindowEventHandler -= value;
-
-                if (_offWindowEventHandler == null && OffWindowSignal().Empty() == false)
-                {
-                    this.OffWindowSignal().Disconnect(_offWindowEventCallback);
-                }
-            }
-        }
-
-        /// <summary>
-        /// [Obsolete("Please do not use! this will be deprecated")]
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        /// Please do not use! this will be deprecated!
-        /// Instead please use Relayout.
-        [Obsolete("Please do not use! This will be deprecated! Please use Relayout instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public event EventHandler OnRelayoutEvent
-        {
-            add
-            {
-                if (_onRelayoutEventHandler == null)
-                {
-                    _onRelayoutEventCallback = OnRelayout;
-                    this.OnRelayoutSignal().Connect(_onRelayoutEventCallback);
-                }
-
-                _onRelayoutEventHandler += value;
-            }
-
-            remove
-            {
-                _onRelayoutEventHandler -= value;
-
-                if (_onRelayoutEventHandler == null && OnRelayoutSignal().Empty() == false)
-                {
-                    this.OnRelayoutSignal().Disconnect(_onRelayoutEventCallback);
-                }
-
-            }
-        }
-
-        /// <summary>
         /// "Please DO NOT use! This will be deprecated! Please use 'Container GetParent() for derived class' instead!"
         /// </summary>
         /// <since_tizen> 3 </since_tizen>

diff --git a/src/Tizen.NUI/src/public/ImfManager.cs b/src/Tizen.NUI/src/public/ImfManager.cs
index 41c33c9..226577c 100755 (executable)
--- a/src/Tizen.NUI/src/public/ImfManager.cs
+++ b/src/Tizen.NUI/src/public/ImfManager.cs
@@ -87,31 +87,6 @@ namespace Tizen.NUI
                 KeyboardTypeChangedSignal().Disconnect(_keyboardTypeChangedEventCallback);
             }
 
-            if (_imfManagerLanguageChangedEventCallback != null)
-            {
-                LanguageChangedSignal().Disconnect(_imfManagerLanguageChangedEventCallback);
-            }
-
-            if (_imfManagerResizedEventCallback != null)
-            {
-                ResizedSignal().Disconnect(_imfManagerResizedEventCallback);
-            }
-
-            if (_imfManagerStatusChangedEventCallback != null)
-            {
-                StatusChangedSignal().Disconnect(_imfManagerStatusChangedEventCallback);
-            }
-
-            if (_imfManagerEventReceivedEventCallback != null)
-            {
-                EventReceivedSignal().Disconnect(_imfManagerEventReceivedEventCallback);
-            }
-
-            if (_imfManagerActivatedEventCallback != null)
-            {
-                ActivatedSignal().Disconnect(_imfManagerActivatedEventCallback);
-            }
-
             if (swigCPtr.Handle != global::System.IntPtr.Zero)
             {
                 if (swigCMemOwn)
@@ -261,27 +236,6 @@ namespace Tizen.NUI
             /// <summary>
             /// The pre-edit or the commit string.
             /// </summary>
-            /// /// <since_tizen> 3 </since_tizen>
-            [Obsolete("Please do not use! This will be deprecated! Please use PredictiveString instead!")]
-            [EditorBrowsable(EditorBrowsableState.Never)]
-            public string predictiveString
-            {
-                set
-                {
-                    NDalicManualPINVOKE.ImfManager_ImfEventData_predictiveString_set(swigCPtr, value);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                }
-                get
-                {
-                    string ret = NDalicManualPINVOKE.ImfManager_ImfEventData_predictiveString_get(swigCPtr);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                    return ret;
-                }
-            }
-
-            /// <summary>
-            /// The pre-edit or the commit string.
-            /// </summary>
             /// <since_tizen> 4 </since_tizen>
             public string PredictiveString
             {
@@ -301,28 +255,6 @@ namespace Tizen.NUI
             /// <summary>
             /// The name of the event from the IMF.
             /// </summary>
-            /// Please do not use! this will be deprecated
-            /// <since_tizen> 3 </since_tizen>
-            [Obsolete("Please do not use! This will be deprecated! Please use EventName instead!")]
-            [EditorBrowsable(EditorBrowsableState.Never)]
-            public ImfManager.ImfEvent eventName
-            {
-                set
-                {
-                    NDalicManualPINVOKE.ImfManager_ImfEventData_eventName_set(swigCPtr, (int)value);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                }
-                get
-                {
-                    ImfManager.ImfEvent ret = (ImfManager.ImfEvent)NDalicManualPINVOKE.ImfManager_ImfEventData_eventName_get(swigCPtr);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                    return ret;
-                }
-            }
-
-            /// <summary>
-            /// The name of the event from the IMF.
-            /// </summary>
             /// <since_tizen> 4 </since_tizen>
             public ImfManager.ImfEvent EventName
             {
@@ -342,28 +274,6 @@ namespace Tizen.NUI
             /// <summary>
             /// The start position from the current cursor position to start deleting characters.
             /// </summary>
-            /// Please do not use! this will be deprecated
-            /// <since_tizen> 3 </since_tizen>
-            [Obsolete("Please do not use! This will be deprecated! Please use CursorOffset instead!")]
-            [EditorBrowsable(EditorBrowsableState.Never)]
-            public int cursorOffset
-            {
-                set
-                {
-                    NDalicManualPINVOKE.ImfManager_ImfEventData_cursorOffset_set(swigCPtr, value);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                }
-                get
-                {
-                    int ret = NDalicManualPINVOKE.ImfManager_ImfEventData_cursorOffset_get(swigCPtr);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                    return ret;
-                }
-            }
-
-            /// <summary>
-            /// The start position from the current cursor position to start deleting characters.
-            /// </summary>
             /// <since_tizen> 4 </since_tizen>
             public int CursorOffset
             {
@@ -383,28 +293,6 @@ namespace Tizen.NUI
             /// <summary>
             /// The number of characters to delete from the cursorOffset.
             /// </summary>
-            /// Please do not use! this will be deprecated
-            /// <since_tizen> 3 </since_tizen>
-            [Obsolete("Please do not use! This will be deprecated! Please use NumberOfChars instead!")]
-            [EditorBrowsable(EditorBrowsableState.Never)]
-            public int numberOfChars
-            {
-                set
-                {
-                    NDalicManualPINVOKE.ImfManager_ImfEventData_numberOfChars_set(swigCPtr, value);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                }
-                get
-                {
-                    int ret = NDalicManualPINVOKE.ImfManager_ImfEventData_numberOfChars_get(swigCPtr);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                    return ret;
-                }
-            }
-
-            /// <summary>
-            /// The number of characters to delete from the cursorOffset.
-            /// </summary>
             /// <since_tizen> 4 </since_tizen>
             public int NumberOfChars
             {
@@ -565,28 +453,6 @@ namespace Tizen.NUI
             /// <summary>
             /// The current text string.
             /// </summary>
-            /// Please do not use! this will be deprecated
-            /// <since_tizen> 3 </since_tizen>
-            [Obsolete("Please do not use! This will be deprecated! Please use CurrentText instead!")]
-            [EditorBrowsable(EditorBrowsableState.Never)]
-            public string currentText
-            {
-                set
-                {
-                    NDalicManualPINVOKE.ImfManager_ImfCallbackData_currentText_set(swigCPtr, value);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                }
-                get
-                {
-                    string ret = NDalicManualPINVOKE.ImfManager_ImfCallbackData_currentText_get(swigCPtr);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                    return ret;
-                }
-            }
-
-            /// <summary>
-            /// The current text string.
-            /// </summary>
             /// <since_tizen> 4 </since_tizen>
             public string CurrentText
             {
@@ -606,28 +472,6 @@ namespace Tizen.NUI
             /// <summary>
             /// The current text string.
             /// </summary>
-            /// Please do not use! this will be deprecated
-            /// <since_tizen> 3 </since_tizen>
-            [Obsolete("Please do not use! This will be deprecated! Please use CursorPosition instead!")]
-            [EditorBrowsable(EditorBrowsableState.Never)]
-            public int cursorPosition
-            {
-                set
-                {
-                    NDalicManualPINVOKE.ImfManager_ImfCallbackData_cursorPosition_set(swigCPtr, value);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                }
-                get
-                {
-                    int ret = NDalicManualPINVOKE.ImfManager_ImfCallbackData_cursorPosition_get(swigCPtr);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                    return ret;
-                }
-            }
-
-            /// <summary>
-            /// The current text string.
-            /// </summary>
             /// <since_tizen> 4 </since_tizen>
             public int CursorPosition
             {
@@ -647,28 +491,6 @@ namespace Tizen.NUI
             /// <summary>
             /// If the cursor position needs to be updated.
             /// </summary>
-            /// Please do not use! this will be deprecated
-            /// <since_tizen> 3 </since_tizen>
-            [Obsolete("Please do not use! This will be deprecated! Please use Update instead!")]
-            [EditorBrowsable(EditorBrowsableState.Never)]
-            public bool update
-            {
-                set
-                {
-                    NDalicManualPINVOKE.ImfManager_ImfCallbackData_update_set(swigCPtr, value);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                }
-                get
-                {
-                    bool ret = NDalicManualPINVOKE.ImfManager_ImfCallbackData_update_get(swigCPtr);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                    return ret;
-                }
-            }
-
-            /// <summary>
-            /// If the cursor position needs to be updated.
-            /// </summary>
             /// <since_tizen> 4 </since_tizen>
             public bool Update
             {
@@ -688,28 +510,6 @@ namespace Tizen.NUI
             /// <summary>
             /// Flags if preedit reset is required.
             /// </summary>
-            /// Please do not use! this will be deprecated
-            /// <since_tizen> 3 </since_tizen>
-            [Obsolete("Please do not use! This will be deprecated! Please use PreeditResetRequired instead!")]
-            [EditorBrowsable(EditorBrowsableState.Never)]
-            public bool preeditResetRequired
-            {
-                set
-                {
-                    NDalicManualPINVOKE.ImfManager_ImfCallbackData_preeditResetRequired_set(swigCPtr, value);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                }
-                get
-                {
-                    bool ret = NDalicManualPINVOKE.ImfManager_ImfCallbackData_preeditResetRequired_get(swigCPtr);
-                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                    return ret;
-                }
-            }
-
-            /// <summary>
-            /// Flags if preedit reset is required.
-            /// </summary>
             /// <since_tizen> 4 </since_tizen>
             public bool PreeditResetRequired
             {
@@ -1035,76 +835,6 @@ namespace Tizen.NUI
         /// <summary>
         /// ImfManager activated event arguments.
         /// </summary>
-        /// Please do not use! this will be deprecated
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated! Please use ActivatedEventArgs instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public class ImfManagerActivatedEventArgs : EventArgs
-        {
-            /// <summary>
-            /// ImfManager
-            /// </summary>
-            /// <since_tizen> 3 </since_tizen>
-            public ImfManager ImfManager
-            {
-                get;
-                set;
-            }
-        }
-
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        private delegate void ImfManagerActivatedEventCallbackType(global::System.IntPtr data);
-        private ImfManagerActivatedEventCallbackType _imfManagerActivatedEventCallback;
-        private event EventHandler<ImfManagerActivatedEventArgs> _imfManagerActivatedEventHandler;
-
-        /// <summary>
-        /// ImfManager activated event.
-        /// </summary>
-        ///Please do not use! this will be deprecated
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated! Please use Activated instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public event EventHandler<ImfManagerActivatedEventArgs> ImfManagerActivated
-        {
-            add
-            {
-                if (_imfManagerActivatedEventHandler == null)
-                {
-                    _imfManagerActivatedEventCallback = OnImfManagerActivated;
-                    ActivatedSignal().Connect(_imfManagerActivatedEventCallback);
-                }
-
-                _imfManagerActivatedEventHandler += value;
-            }
-            remove
-            {
-                _imfManagerActivatedEventHandler -= value;
-
-                if (_imfManagerActivatedEventHandler == null && _imfManagerActivatedEventCallback != null)
-                {
-                    ActivatedSignal().Disconnect(_imfManagerActivatedEventCallback);
-                }
-            }
-        }
-
-        private void OnImfManagerActivated(global::System.IntPtr data)
-        {
-            ImfManagerActivatedEventArgs e = new ImfManagerActivatedEventArgs();
-
-            if (data != null)
-            {
-                e.ImfManager = Registry.GetManagedBaseHandleFromNativePtr(data) as ImfManager;
-            }
-
-            if (_imfManagerActivatedEventHandler != null)
-            {
-                _imfManagerActivatedEventHandler(this, e);
-            }
-        }
-
-        /// <summary>
-        /// ImfManager activated event arguments.
-        /// </summary>
         /// <since_tizen> 4 </since_tizen>
         public class ActivatedEventArgs : EventArgs
         {
@@ -1166,14 +896,7 @@ namespace Tizen.NUI
             }
         }
 
-        /// <summary>
-        /// ImfManager activated signal.
-        /// </summary>
-        /// Please do not use! this will be internal
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public ActivatedSignalType ActivatedSignal()
+        internal ActivatedSignalType ActivatedSignal()
         {
             ActivatedSignalType ret = new ActivatedSignalType(NDalicManualPINVOKE.ImfManager_ActivatedSignal(swigCPtr), false);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -1183,75 +906,6 @@ namespace Tizen.NUI
         /// <summary>
         /// ImfManager event received event arguments.
         /// </summary>
-        /// Please do not use! this will be deprecated
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated! Please use EventReceivedEventArgs instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public class ImfManagerEventReceivedEventArgs : EventArgs
-        {
-            /// <summary>
-            /// ImfManager
-            /// </summary>
-            /// <since_tizen> 3 </since_tizen>
-            public ImfManager ImfManager
-            {
-                get;
-                set;
-            }
-        }
-
-        private delegate void ImfManagerEventReceivedEventCallbackType(global::System.IntPtr data);
-        private ImfManagerEventReceivedEventCallbackType _imfManagerEventReceivedEventCallback;
-        private event EventHandler<ImfManagerEventReceivedEventArgs> _imfManagerEventReceivedEventHandler;
-
-        /// <summary>
-        /// ImfManager event received.
-        /// </summary>
-        ///Please do not use! this will be deprecated
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated! Please use EventReceived instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public event EventHandler<ImfManagerEventReceivedEventArgs> ImfManagerEventReceived
-        {
-            add
-            {
-                if (_imfManagerEventReceivedEventHandler == null)
-                {
-                    _imfManagerEventReceivedEventCallback = OnImfManagerEventReceived;
-                    EventReceivedSignal().Connect(_imfManagerEventReceivedEventCallback);
-                }
-
-                _imfManagerEventReceivedEventHandler += value;
-            }
-            remove
-            {
-                _imfManagerEventReceivedEventHandler -= value;
-
-                if (_imfManagerEventReceivedEventHandler == null && _imfManagerEventReceivedEventCallback != null)
-                {
-                    EventReceivedSignal().Disconnect(_imfManagerEventReceivedEventCallback);
-                }
-            }
-        }
-
-        private void OnImfManagerEventReceived(global::System.IntPtr data)
-        {
-            ImfManagerEventReceivedEventArgs e = new ImfManagerEventReceivedEventArgs();
-
-            if (data != null)
-            {
-                e.ImfManager = Registry.GetManagedBaseHandleFromNativePtr(data) as ImfManager;
-            }
-
-            if (_imfManagerEventReceivedEventHandler != null)
-            {
-                _imfManagerEventReceivedEventHandler(this, e);
-            }
-        }
-
-        /// <summary>
-        /// ImfManager event received event arguments.
-        /// </summary>
         /// <since_tizen> 4 </since_tizen>
         public class EventReceivedEventArgs : EventArgs
         {
@@ -1336,14 +990,7 @@ namespace Tizen.NUI
             }
         }
 
-        /// <summary>
-        /// ImfManager event received signal.
-        /// </summary>
-        /// Please do not use! this will be internal
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public ImfEventSignalType EventReceivedSignal()
+        internal ImfEventSignalType EventReceivedSignal()
         {
             ImfEventSignalType ret = new ImfEventSignalType(NDalicManualPINVOKE.ImfManager_EventReceivedSignal(swigCPtr), false);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -1353,75 +1000,6 @@ namespace Tizen.NUI
         /// <summary>
         /// ImfManager status changed event arguments.
         /// </summary>
-        ///Please do not use! this will be deprecated
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated! Please use StatusChangedEventArgs instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public class ImfManagerStatusChangedEventArgs : EventArgs
-        {
-            /// <summary>
-            /// ImfManager
-            /// </summary>
-            /// <since_tizen> 3 </since_tizen>
-            public ImfManager ImfManager
-            {
-                get;
-                set;
-            }
-        }
-
-        private delegate void ImfManagerStatusChangedEventCallbackType(global::System.IntPtr data);
-        private ImfManagerStatusChangedEventCallbackType _imfManagerStatusChangedEventCallback;
-        private event EventHandler<ImfManagerStatusChangedEventArgs> _imfManagerStatusChangedEventHandler;
-
-        /// <summary>
-        /// ImfManager status changed.
-        /// </summary>
-        /// Please do not use! this will be deprecated
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated! Please use StatusChanged instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public event EventHandler<ImfManagerStatusChangedEventArgs> ImfManagerStatusChanged
-        {
-            add
-            {
-                if (_imfManagerStatusChangedEventHandler == null)
-                {
-                    _imfManagerStatusChangedEventCallback = OnImfManagerStatusChanged;
-                    StatusChangedSignal().Connect(_imfManagerStatusChangedEventCallback);
-                }
-
-                _imfManagerStatusChangedEventHandler += value;
-            }
-            remove
-            {
-                _imfManagerStatusChangedEventHandler -= value;
-
-                if (_imfManagerStatusChangedEventHandler == null && _imfManagerStatusChangedEventCallback != null)
-                {
-                    StatusChangedSignal().Disconnect(_imfManagerStatusChangedEventCallback);
-                }
-            }
-        }
-
-        private void OnImfManagerStatusChanged(global::System.IntPtr data)
-        {
-            ImfManagerStatusChangedEventArgs e = new ImfManagerStatusChangedEventArgs();
-
-            if (data != null)
-            {
-                e.ImfManager = Registry.GetManagedBaseHandleFromNativePtr(data) as ImfManager;
-            }
-
-            if (_imfManagerStatusChangedEventHandler != null)
-            {
-                _imfManagerStatusChangedEventHandler(this, e);
-            }
-        }
-
-        /// <summary>
-        /// ImfManager status changed event arguments.
-        /// </summary>
         /// <since_tizen> 4 </since_tizen>
         public class StatusChangedEventArgs : EventArgs
         {
@@ -1479,14 +1057,7 @@ namespace Tizen.NUI
             }
         }
 
-        /// <summary>
-        /// ImfManager status changed signal.
-        /// </summary>
-        ///Please do not use! this will be internal
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public StatusSignalType StatusChangedSignal()
+        internal StatusSignalType StatusChangedSignal()
         {
             StatusSignalType ret = new StatusSignalType(NDalicManualPINVOKE.ImfManager_StatusChangedSignal(swigCPtr), false);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -1494,75 +1065,6 @@ namespace Tizen.NUI
         }
 
         /// <summary>
-        /// ImfManager resized event arguments.
-        /// </summary>
-        ///Please do not use! this will be deprecated
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated! Please use ResizedEventArgs instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public class ImfManagerResizedEventArgs : EventArgs
-        {
-            /// <summary>
-            /// ImfManager
-            /// </summary>
-            /// <since_tizen> 3 </since_tizen>
-            public ImfManager ImfManager
-            {
-                get;
-                set;
-            }
-        }
-
-        private delegate void ImfManagerResizedEventCallbackType(IntPtr data);
-        private ImfManagerResizedEventCallbackType _imfManagerResizedEventCallback;
-        private event EventHandler<ImfManagerResizedEventArgs> _imfManagerResizedEventHandler;
-
-        /// <summary>
-        /// ImfManager resized event.
-        /// </summary>
-        ///Please do not use! this will be deprecated
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated! Please use Resized instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public event EventHandler<ImfManagerResizedEventArgs> ImfManagerResized
-        {
-            add
-            {
-                if (_imfManagerResizedEventHandler == null)
-                {
-                    _imfManagerResizedEventCallback = OnImfManagerResized;
-                    ResizedSignal().Connect(_imfManagerResizedEventCallback);
-                }
-
-                _imfManagerResizedEventHandler += value;
-            }
-            remove
-            {
-                _imfManagerResizedEventHandler -= value;
-
-                if (_imfManagerResizedEventHandler == null && _imfManagerResizedEventCallback != null)
-                {
-                    ResizedSignal().Disconnect(_imfManagerResizedEventCallback);
-                }
-            }
-        }
-
-        private void OnImfManagerResized(IntPtr data)
-        {
-            ImfManagerResizedEventArgs e = new ImfManagerResizedEventArgs();
-
-            if (data != null)
-            {
-                e.ImfManager = Registry.GetManagedBaseHandleFromNativePtr(data) as ImfManager;
-            }
-
-            if (_imfManagerResizedEventHandler != null)
-            {
-                _imfManagerResizedEventHandler(this, e);
-            }
-        }
-
-        /// <summary>
         /// ImfManager resized event.
         /// </summary>
         /// <since_tizen> 4 </since_tizen>
@@ -1621,14 +1123,7 @@ namespace Tizen.NUI
             }
         }
 
-        /// <summary>
-        /// ImfManager resized signal.
-        /// </summary>
-        ///Please do not use! this will be internal
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public KeyboardResizedSignalType ResizedSignal()
+        internal KeyboardResizedSignalType ResizedSignal()
         {
             KeyboardResizedSignalType ret = new KeyboardResizedSignalType(NDalicManualPINVOKE.ImfManager_ResizedSignal(swigCPtr), false);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -1636,75 +1131,6 @@ namespace Tizen.NUI
         }
 
         /// <summary>
-        /// ImfManager language changed event arguments.
-        /// </summary>
-        ///Please do not use! this will be deprecated
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated! Please use LanguageChangedEventArgs instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public class ImfManagerLanguageChangedEventArgs : EventArgs
-        {
-            /// <summary>
-            /// ImfManager
-            /// </summary>
-            /// <since_tizen> 3 </since_tizen>
-            public ImfManager ImfManager
-            {
-                get;
-                set;
-            }
-        }
-
-        private delegate void ImfManagerLanguageChangedEventCallbackType(IntPtr data);
-        private ImfManagerLanguageChangedEventCallbackType _imfManagerLanguageChangedEventCallback;
-        private event EventHandler<ImfManagerLanguageChangedEventArgs> _imfManagerLanguageChangedEventHandler;
-
-        /// <summary>
-        /// ImfManager language changed event.
-        /// </summary>
-        ///Please do not use! this will be deprecated
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated! Please use LanguageChanged instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public event EventHandler<ImfManagerLanguageChangedEventArgs> ImfManagerLanguageChanged
-        {
-            add
-            {
-                if (_imfManagerLanguageChangedEventHandler == null)
-                {
-                    _imfManagerLanguageChangedEventCallback = OnImfManagerLanguageChanged;
-                    LanguageChangedSignal().Connect(_imfManagerLanguageChangedEventCallback);
-                }
-
-                _imfManagerLanguageChangedEventHandler += value;
-            }
-            remove
-            {
-                _imfManagerLanguageChangedEventHandler -= value;
-
-                if (_imfManagerLanguageChangedEventHandler == null && _imfManagerLanguageChangedEventCallback != null)
-                {
-                    LanguageChangedSignal().Disconnect(_imfManagerLanguageChangedEventCallback);
-                }
-            }
-        }
-
-        private void OnImfManagerLanguageChanged(IntPtr data)
-        {
-            ImfManagerLanguageChangedEventArgs e = new ImfManagerLanguageChangedEventArgs();
-
-            if (data != null)
-            {
-                e.ImfManager = Registry.GetManagedBaseHandleFromNativePtr(data) as ImfManager;
-            }
-
-            if (_imfManagerLanguageChangedEventHandler != null)
-            {
-                _imfManagerLanguageChangedEventHandler(this, e);
-            }
-        }
-
-        /// <summary>
         /// ImfManager language changed event args.
         /// </summary>
         /// <since_tizen> 4 </since_tizen>
@@ -1763,14 +1189,7 @@ namespace Tizen.NUI
             }
         }
 
-        /// <summary>
-        /// ImfManager language changed signal.
-        /// </summary>
-        ///Please do not use! this will be internal
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public LanguageChangedSignalType LanguageChangedSignal()
+        internal LanguageChangedSignalType LanguageChangedSignal()
         {
             LanguageChangedSignalType ret = new LanguageChangedSignalType(NDalicManualPINVOKE.ImfManager_LanguageChangedSignal(swigCPtr), false);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/src/Tizen.NUI/src/public/NUIApplication.cs b/src/Tizen.NUI/src/public/NUIApplication.cs
index 3b70b65..000cc7a 100755 (executable)
--- a/src/Tizen.NUI/src/public/NUIApplication.cs
+++ b/src/Tizen.NUI/src/public/NUIApplication.cs
@@ -176,7 +176,7 @@ namespace Tizen.NUI
             // Dali's default layer is default center origin. need to change as top left.
             // NUI's Layer is like a transparent film which covers entire window. (Layer is not an actor of Dali)
             // otherwise, this makes ScreenPosition as wrong value.
-            Layer defaultLayer = Window.GetDefaultLayer();
+            Layer defaultLayer = Window.Instance.GetDefaultLayer();
             defaultLayer.SetParentOrigin(Tizen.NUI.ParentOrigin.TopLeft);
             defaultLayer.SetAnchorPoint(Tizen.NUI.PivotPoint.TopLeft);
         }
@@ -256,19 +256,5 @@ namespace Tizen.NUI
                 resourceManager = value;
             }
         }
-
-        /// <summary>
-        /// Gets the window instance.
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        [Obsolete("Please do not use! This will be deprecated!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public Window Window
-        {
-            get
-            {
-                return Window.Instance;
-            }
-        }
     }
 }

diff --git a/src/Tizen.NUI/src/public/Position.cs b/src/Tizen.NUI/src/public/Position.cs
index e8b1dd5..38d5382 100755 (executable)
--- a/src/Tizen.NUI/src/public/Position.cs
+++ b/src/Tizen.NUI/src/public/Position.cs
@@ -927,62 +927,5 @@ namespace Tizen.NUI
             return new Position(vec.X, vec.Y, vec.Z);
         }
 
-        /// <summary>
-        /// [Obsolete("Please do not use! this will be deprecated")]
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        /// Please do not use! this will be deprecated!
-        /// Instead please use PivotPointTopRight.
-        [Obsolete("Please do not use! This will be deprecated! Please use PivotPoint.TopRight instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static Position AnchorPointTopRight
-        {
-            get
-            {
-                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopRight_get();
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                return ret;
-            }
-        }
-
-        /// <summary>
-        /// [Obsolete("Please do not use! this will be deprecated")]
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        /// Please do not use! this will be deprecated!
-        /// Instead please use PivotPointCenterLeft.
-        [Obsolete("Please do not use! This will be deprecated! Please use PivotPoint.CenterLeft instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static Position AnchorPointCenterLeft
-        {
-            get
-            {
-                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenterLeft_get();
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                return ret;
-            }
-        }
-
-        /// <summary>
-        /// [Obsolete("Please do not use! this will be deprecated")]
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        /// Please do not use! this will be deprecated!
-        /// Instead please use PivotPointBottomRight.
-        [Obsolete("Please do not use! This will be deprecated! Please use PivotPoint.BottomRight instead!")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static Position AnchorPointBottomRight
-        {
-            get
-            {
-                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomRight_get();
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                return ret;
-            }
-        }
-
     }
 }
\ No newline at end of file