[Tizen] Fix build error

Change-Id: Iac8a10085e54540a4f5b6706df279ab75c06bfd3
Signed-off-by: minho.sun <minho.sun@samsung.com>

diff --git a/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
index e201109..83931f8 100755 (executable)
--- a/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
+++ b/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
@@ -104,18 +104,10 @@ namespace Tizen.NUI.BaseComponents
             internal static readonly int ELLIPSIS = NDalicManualPINVOKE.TextLabel_Property_ELLIPSIS_get();
             internal static readonly int AUTO_SCROLL_STOP_MODE = NDalicManualPINVOKE.TextLabel_Property_AUTO_SCROLL_STOP_MODE_get();
             internal static readonly int AUTO_SCROLL_LOOP_DELAY = NDalicManualPINVOKE.TextLabel_Property_AUTO_SCROLL_LOOP_DELAY_get();
-<<<<<<< HEAD
-            internal static readonly int TEXT_COLOR_ANIMATABLE = NDalicPINVOKE.TextLabel_Property_TEXT_COLOR_ANIMATABLE_get();
-            internal static readonly int LINE_COUNT = OUTLINE + 5;
-=======
             internal static readonly int LINE_COUNT = NDalicManualPINVOKE.TextLabel_Property_LINE_COUNT_get();
             internal static readonly int LINE_WRAP_MODE = NDalicManualPINVOKE.TextLabel_Property_LINE_WRAP_MODE_get();
-<<<<<<< HEAD
->>>>>>> parent of b621f76... Revert "[Tizen] Add properties of TextLabel/Editor"
-=======
             internal static readonly int TEXT_COLOR_ANIMATABLE = NDalicPINVOKE.TextLabel_Property_TEXT_COLOR_ANIMATABLE_get();
 
->>>>>>> parent of bb0612e... Revert "[Tizen] Animatable TextColor Property for TextLabel"
         }
 
         /// <summary>

diff --git a/Tizen.NUI/src/public/BaseComponents/View.cs b/Tizen.NUI/src/public/BaseComponents/View.cs
index acb9cd9..38fc529 100755 (executable)
--- a/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -1868,7 +1868,7 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                return GetParent();
+                return GetParent() as View;
             }
         }
 
@@ -2277,26 +2277,6 @@ namespace Tizen.NUI.BaseComponents
             return ret;
         }*/
 
-        internal View GetParent()
-        {
-            View ret;
-            IntPtr cPtr = NDalicPINVOKE.Actor_GetParent(swigCPtr);
-
-            BaseHandle basehandle = Registry.GetManagedBaseHandleFromNativePtr(cPtr);
-
-            if(basehandle is Layer)
-            {
-                View ret2 = new View(cPtr,false);
-                return ret2;
-            }
-
-            ret = basehandle as View;
-
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
         internal void SetParentOrigin(Vector3 origin)
         {
             NDalicPINVOKE.Actor_SetParentOrigin(swigCPtr, Vector3.getCPtr(origin));

diff --git a/Tizen.NUI/src/public/ImfManager.cs b/Tizen.NUI/src/public/ImfManager.cs
index 71bbc88..946f353 100755 (executable)
--- a/Tizen.NUI/src/public/ImfManager.cs
+++ b/Tizen.NUI/src/public/ImfManager.cs
@@ -54,9 +54,9 @@ namespace Tizen.NUI
             //You should not access any managed member here except static instance.
             //because the execution order of Finalizes is non-deterministic.
 
-            if (_imfKeyboardTypeChangedEventCallback != null)
+            if (_keyboardTypeChangedEventCallback != null)
             {
-                KeyboardTypeChangedSignal().Disconnect(_imfKeyboardTypeChangedEventCallback);
+                KeyboardTypeChangedSignal().Disconnect(_keyboardTypeChangedEventCallback);
             }
 
             if (_imfManagerLanguageChangedEventCallback != null)

diff --git a/Tizen.NUI/src/public/Layer.cs b/Tizen.NUI/src/public/Layer.cs
index 165b170..b7ced1b 100755 (executable)
--- a/Tizen.NUI/src/public/Layer.cs
+++ b/Tizen.NUI/src/public/Layer.cs
@@ -431,8 +431,6 @@ namespace Tizen.NUI
                 SetProperty(View.Property.VISIBLE, new Tizen.NUI.PropertyValue(value));
             }
         }
-<<<<<<< HEAD
-=======
 
         /// <summary>
         /// Get the number of children held by the layer.
@@ -477,6 +475,5 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending)
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
->>>>>>> parent of a941a95... Revert "[Tizen] add Name in Layer, LineCount in TextLabel"
     }
 }