Merge "Do not use layout for Label and Entry." into tizen

diff --git a/src/ElmSharp/ElmSharp/Entry.cs b/src/ElmSharp/ElmSharp/Entry.cs
old mode 100755 (executable)
new mode 100644 (file)
index 5647f03..83a7e1b
--- a/src/ElmSharp/ElmSharp/Entry.cs
+++ b/src/ElmSharp/ElmSharp/Entry.cs
@@ -305,13 +305,8 @@ namespace ElmSharp
 
         protected override IntPtr CreateHandle(EvasObject parent)
         {
-            IntPtr handle = Interop.Elementary.elm_layout_add(parent.Handle);
-            Interop.Elementary.elm_layout_theme_set(handle, "layout", "elm_widget", "default");
-
-            RealHandle = Interop.Elementary.elm_entry_add(handle);
-            Interop.Elementary.elm_object_part_content_set(handle, "elm.swallow.content", RealHandle);
-
-            return handle;
+            //TODO: Fix this to use layout
+            return Interop.Elementary.elm_entry_add(parent.Handle);
         }
     }
 }

diff --git a/src/ElmSharp/ElmSharp/Label.cs b/src/ElmSharp/ElmSharp/Label.cs
old mode 100755 (executable)
new mode 100644 (file)
index 1bcb5b3..6c30010
--- a/src/ElmSharp/ElmSharp/Label.cs
+++ b/src/ElmSharp/ElmSharp/Label.cs
@@ -100,13 +100,8 @@ namespace ElmSharp
 
         protected override IntPtr CreateHandle(EvasObject parent)
         {
-            IntPtr handle = Interop.Elementary.elm_layout_add(parent.Handle);
-            Interop.Elementary.elm_layout_theme_set(handle, "layout", "elm_widget", "default");
-
-            RealHandle = Interop.Elementary.elm_label_add(handle);
-            Interop.Elementary.elm_object_part_content_set(handle, "elm.swallow.content", RealHandle);
-
-            return handle;
+            //TODO: Fix this to use layout
+            return Interop.Elementary.elm_label_add(parent.Handle);
         }
     }