Merge "Add text selection popup style" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / text-controls / text-selection-popup.cpp

diff --git a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp
index cfc5e43..5d953db 100644 (file)
--- a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp
+++ b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp
@@ -64,7 +64,7 @@ void TextSelectionPopup::EnableButtons(Toolkit::TextSelectionPopup::Buttons butt
   GetImpl(*this).EnableButtons(buttonsToEnable);
 }
 
-void TextSelectionPopup::RaiseAbove(Layer target)
+void TextSelectionPopup::RaiseAbove(Actor target)
 {
   GetImpl(*this).RaiseAbove(target);
 }
@@ -79,6 +79,16 @@ void TextSelectionPopup::HidePopup()
   GetImpl(*this).HidePopup();
 }
 
+void TextSelectionPopup::SetProperties(const Dali::Property::Map& properties)
+{
+  GetImpl(*this).SetProperties(properties);
+}
+
+void TextSelectionPopup::GetProperties(Dali::Property::Map& properties)
+{
+  GetImpl(*this).GetProperties(properties);
+}
+
 TextSelectionPopup::TextSelectionPopup(Internal::TextSelectionPopup& implementation)
 : Control(implementation)
 {