Merge remote-tracking branch 'origin/tizen' into new_text

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / popup / popup.cpp

diff --git a/dali-toolkit/public-api/controls/popup/popup.cpp b/dali-toolkit/public-api/controls/popup/popup.cpp
index 6ba2b11..b557f01 100644 (file)
--- a/dali-toolkit/public-api/controls/popup/popup.cpp
+++ b/dali-toolkit/public-api/controls/popup/popup.cpp
@@ -15,7 +15,10 @@
  *
  */
 
+// CLASS HEADER
 #include <dali-toolkit/public-api/controls/popup/popup.h>
+
+// INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/popup/popup-impl.h>
 #include <dali-toolkit/public-api/controls/buttons/button.h>
 
@@ -31,9 +34,6 @@ namespace Toolkit
 // Popup
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-const char* const Popup::SIGNAL_TOUCHED_OUTSIDE = "touched-outside";
-const char* const Popup::SIGNAL_HIDDEN = "hidden";
-
 Popup::Popup()
 {
 }
@@ -87,7 +87,7 @@ void Popup::SetTitle( const std::string& text )
   GetImpl(*this).SetTitle( text );
 }
 
-const std::string& Popup::GetTitle() const
+std::string Popup::GetTitle() const
 {
   return GetImpl(*this).GetTitle();
 }
@@ -132,6 +132,11 @@ void Popup::HideTail()
   GetImpl(*this).HideTail();
 }
 
+void Popup::MarkDirtyForRelayout()
+{
+  GetImpl(*this).MarkDirtyForRelayout();
+}
+
 Popup::TouchedOutsideSignalType& Popup::OutsideTouchedSignal()
 {
   return GetImpl(*this).OutsideTouchedSignal();