From 2b81dfa44d1d4d52ea83289828472005be6681d5 Mon Sep 17 00:00:00 2001 From: Feng Jin Date: Wed, 3 May 2017 03:58:37 +0800 Subject: [PATCH] Fix some build errors. Change-Id: Ibfa71a90aaa268e7cc46ccbcdd705e9acf49dd34 Signed-off-by: Feng Jin --- packaging/csapi-nui.spec | 2 +- src/Tizen.NUI/Tizen.NUI.csproj | 17 +++++++++------- src/Tizen.NUI/src/internal/Application.cs | 4 ++-- src/Tizen.NUI/src/internal/ImfManager.cs | 33 +++++++++++++++---------------- 4 files changed, 29 insertions(+), 27 deletions(-) diff --git a/packaging/csapi-nui.spec b/packaging/csapi-nui.spec index 5d70053..5f2ca99 100755 --- a/packaging/csapi-nui.spec +++ b/packaging/csapi-nui.spec @@ -1,6 +1,6 @@ Name: csapi-nui Summary: dali-NUI -Version: 0.2.36 +Version: 0.2.37 Release: 1 Group: Development/Libraries License: Apache-2.0 and BSD-3-Clause and MIT diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj index 07bed33..d6cbe22 100755 --- a/src/Tizen.NUI/Tizen.NUI.csproj +++ b/src/Tizen.NUI/Tizen.NUI.csproj @@ -222,6 +222,7 @@ + @@ -270,6 +271,7 @@ + @@ -289,6 +291,7 @@ + @@ -333,13 +336,13 @@ - - - - - - - + + + + + + + diff --git a/src/Tizen.NUI/src/internal/Application.cs b/src/Tizen.NUI/src/internal/Application.cs index 5188882..058684a 100755 --- a/src/Tizen.NUI/src/internal/Application.cs +++ b/src/Tizen.NUI/src/internal/Application.cs @@ -19,10 +19,10 @@ namespace Tizen.NUI { public const int ver1 = 1; public const int ver2 = 2; - public const int ver3 = 36; + public const int ver3 = 37; public const int nuiVer1 = 0; public const int nuiVer2 = 2; - public const int nuiVer3 = 36; + public const int nuiVer3 = 37; public const string nuiRelease = ""; } diff --git a/src/Tizen.NUI/src/internal/ImfManager.cs b/src/Tizen.NUI/src/internal/ImfManager.cs index 832b5e5..bb84fa5 100755 --- a/src/Tizen.NUI/src/internal/ImfManager.cs +++ b/src/Tizen.NUI/src/internal/ImfManager.cs @@ -549,7 +549,7 @@ namespace Tizen.NUI } // EventReceivedSignal - public class ImfManagerEventReceivedArgs : EventArgs + public class ImfManagerEventReceivedEventArgs : EventArgs { public ImfManager ImfManager { @@ -560,14 +560,13 @@ namespace Tizen.NUI private delegate void ImfManagerEventReceivedEventCallbackType(global::System.IntPtr data); private ImfManagerEventReceivedEventCallbackType _imfManagerEventReceivedEventCallback; - - private event EventHandler _imfManagerEventReceivedEventHandler; - + + private event EventHandler _imfManagerEventReceivedEventHandler; public event EventHandler ImfManagerEventReceived { add { - if (_imfManageEventReceivedEventHandler == null) + if (_imfManagerEventReceivedEventHandler == null) { _imfManagerEventReceivedEventCallback = OnImfManagerEventReceived; EventReceivedSignal().Connect(_imfManagerEventReceivedEventCallback); @@ -606,7 +605,7 @@ namespace Tizen.NUI } // StatusChangedSignal - public class ImfManagerStatusChangedArgs : EventArgs + public class ImfManagerStatusChangedEventArgs : EventArgs { public ImfManager ImfManager { @@ -618,13 +617,13 @@ namespace Tizen.NUI private delegate void ImfManagerStatusChangedEventCallbackType(global::System.IntPtr data); private ImfManagerStatusChangedEventCallbackType _imfManagerStatusChangedEventCallback; - private event EventHandler _imfManagerStatusChangedEventHandler; + private event EventHandler _imfManagerStatusChangedEventHandler; public event EventHandler ImfManagerStatusChanged { add { - if (_imfManageStatusChangedEventHandler == null) + if (_imfManagerStatusChangedEventHandler == null) { _imfManagerStatusChangedEventCallback = OnImfManagerStatusChanged; StatusChangedSignal().Connect(_imfManagerStatusChangedEventCallback); @@ -663,7 +662,7 @@ namespace Tizen.NUI } // ResizedSignal - public class ImfManagerResizedArgs : EventArgs + public class ImfManagerResizedEventArgs : EventArgs { public ImfManager ImfManager { @@ -675,13 +674,13 @@ namespace Tizen.NUI private delegate void ImfManagerResizedEventCallbackType(global::System.IntPtr data); private ImfManagerResizedEventCallbackType _imfManagerResizedEventCallback; - private event EventHandler _imfManagerResizedEventHandler; + private event EventHandler _imfManagerResizedEventHandler; public event EventHandler ImfManagerResized { add { - if (_imfManageResizedEventHandler == null) + if (_imfManagerResizedEventHandler == null) { _imfManagerResizedEventCallback = OnImfManagerResized; ResizedSignal().Connect(_imfManagerResizedEventCallback); @@ -714,13 +713,13 @@ namespace Tizen.NUI public ImfVoidSignalType ResizedSignal() { - ImfVoidSignalType ret = new ImfVoidSignalType(NDalicManualPINVOKE.ImfManager_ResizedSignal(swigCPtr)); + ImfVoidSignalType ret = new ImfVoidSignalType(NDalicManualPINVOKE.ImfManager_ResizedSignal(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } // LanguageChangedSignal - public class ImfManagerLanguageChangedArgs : EventArgs + public class ImfManagerLanguageChangedEventArgs : EventArgs { public ImfManager ImfManager { @@ -732,13 +731,13 @@ namespace Tizen.NUI private delegate void ImfManagerLanguageChangedEventCallbackType(global::System.IntPtr data); private ImfManagerLanguageChangedEventCallbackType _imfManagerLanguageChangedEventCallback; - private event EventHandler _imfManagerLanguageChangedEventHandler; + private event EventHandler _imfManagerLanguageChangedEventHandler; public event EventHandler ImfManagerLanguageChanged { add { - if (_imfManageLanguageChangedEventHandler == null) + if (_imfManagerLanguageChangedEventHandler == null) { _imfManagerLanguageChangedEventCallback = OnImfManagerLanguageChanged; LanguageChangedSignal().Connect(_imfManagerLanguageChangedEventCallback); @@ -771,7 +770,7 @@ namespace Tizen.NUI public ImfVoidSignalType LanguageChangedSignal() { - ImfVoidSignalType ret = new ImfVoidSignalType(NDalicManualPINVOKE.ImfManager_LanguageChangedSignal(swigCPtr)); + ImfVoidSignalType ret = new ImfVoidSignalType(NDalicManualPINVOKE.ImfManager_LanguageChangedSignal(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -975,7 +974,7 @@ namespace Tizen.NUI public void Emit(bool arg1, bool arg2) { - NDalicManualPINVOKE.ImfEventSignalType_Emit(swigCPtr, arg1, agr2); + NDalicManualPINVOKE.ImfEventSignalType_Emit(swigCPtr, arg1, arg2); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } -- 2.7.4