X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FTizen.NUI%2Fsrc%2Finternal%2FActivatedSignalType.cs;h=1f8dfb62452be702609fdf048c2b1a85104f49e5;hb=46b8a31f5c1c75a22b648ca394a4de8a50898513;hp=d7191c10feb4b648f81b0dfbbb69dffbd838c375;hpb=4ee19b6e4a9ffc17d24df557215ebc09e24cd2b6;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git
diff --git a/src/Tizen.NUI/src/internal/ActivatedSignalType.cs b/src/Tizen.NUI/src/internal/ActivatedSignalType.cs
index d7191c1..1f8dfb6 100755
--- a/src/Tizen.NUI/src/internal/ActivatedSignalType.cs
+++ b/src/Tizen.NUI/src/internal/ActivatedSignalType.cs
@@ -1,5 +1,5 @@
/*
- * Copyright(c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2018 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.
@@ -20,7 +20,7 @@ using System.ComponentModel;
namespace Tizen.NUI
{
- internal class ActivatedSignalType : global::System.IDisposable
+ internal class ActivatedSignalType : Disposable
{
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
///
@@ -40,69 +40,17 @@ namespace Tizen.NUI
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;
- ///
- /// A Flat to check if it is already disposed.
- ///
- /// 3
- protected bool disposed = false;
-
///
/// Dispose
///
/// 3
- ~ActivatedSignalType()
- {
- if (!isDisposeQueued)
- {
- isDisposeQueued = true;
- DisposeQueue.Instance.Add(this);
- }
- }
-
- ///
- /// Dispose
- ///
- /// 3
- 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);
- }
- }
-
- ///
- /// Dispose
- ///
- /// 3
- protected virtual void Dispose(DisposeTypes type)
+ protected override 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.
@@ -112,12 +60,12 @@ namespace Tizen.NUI
if (swigCMemOwn)
{
swigCMemOwn = false;
- NDalicManualPINVOKE.delete_ActivatedSignalType(swigCPtr);
+ Interop.ActivatedSignalType.delete_ActivatedSignalType(swigCPtr);
}
swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
}
- disposed = true;
+ base.Dispose(type);
}
///
@@ -127,7 +75,7 @@ namespace Tizen.NUI
/// 3
public bool Empty()
{
- bool ret = NDalicManualPINVOKE.ActivatedSignalType_Empty(swigCPtr);
+ bool ret = Interop.ActivatedSignalType.ActivatedSignalType_Empty(swigCPtr);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
@@ -139,7 +87,7 @@ namespace Tizen.NUI
/// 3
public uint GetConnectionCount()
{
- uint ret = NDalicManualPINVOKE.ActivatedSignalType_GetConnectionCount(swigCPtr);
+ uint ret = Interop.ActivatedSignalType.ActivatedSignalType_GetConnectionCount(swigCPtr);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
return ret;
}
@@ -153,7 +101,7 @@ namespace Tizen.NUI
{
System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
{
- NDalicManualPINVOKE.ActivatedSignalType_Connect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
+ Interop.ActivatedSignalType.ActivatedSignalType_Connect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
}
@@ -167,7 +115,7 @@ namespace Tizen.NUI
{
System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
{
- NDalicManualPINVOKE.ActivatedSignalType_Disconnect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
+ Interop.ActivatedSignalType.ActivatedSignalType_Disconnect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
}
@@ -176,10 +124,10 @@ namespace Tizen.NUI
/// Emits the signal.
///
/// The first value to pass to callbacks
- /// 4
- public void Emit(ImfManager arg)
+ /// 5
+ public void Emit(InputMethodContext arg)
{
- NDalicManualPINVOKE.ActivatedSignalType_Emit(swigCPtr, ImfManager.getCPtr(arg));
+ Interop.ActivatedSignalType.ActivatedSignalType_Emit(swigCPtr, InputMethodContext.getCPtr(arg));
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
@@ -187,11 +135,9 @@ namespace Tizen.NUI
/// The contructor.
///
/// 3
- public ActivatedSignalType() : this(NDalicManualPINVOKE.new_ActivatedSignalType(), true)
+ public ActivatedSignalType() : this(Interop.ActivatedSignalType.new_ActivatedSignalType(), true)
{
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
-
}
-
}