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

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

diff --git a/base/dali-toolkit/public-api/controls/popup/popup.h b/base/dali-toolkit/public-api/controls/popup/popup.h
index 4806137..55d05c1 100644 (file)
--- a/base/dali-toolkit/public-api/controls/popup/popup.h
+++ b/base/dali-toolkit/public-api/controls/popup/popup.h
@@ -20,9 +20,8 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/public-api/controls/text-view/text-view.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -63,7 +62,7 @@ class Button;
  * A popup can use various custom transition effects, e.g.
  * Alpha fade, Scaling transition, position/rotation, shader effects.
  */
-class Popup : public Control
+class DALI_IMPORT_API Popup : public Control
 {
 
 public:
@@ -165,18 +164,11 @@ public:
   void SetTitle( const std::string& text );
 
   /**
-   * @brief Sets a title for this Popup.
-   *
-   * @param[in] titleActor The TextView to appear as the heading for this Popup
-   */
-  void SetTitle( TextView titleActor );
-
-  /**
    * @brief Gets the text (TextView) for this Popup.
    *
-   * @return The TextView representing this popup is returned.
+   * @return The text to appear as the heading for this Popup
    */
-  TextView GetTitle() const;
+  const std::string& GetTitle() const;
 
   /**
    * @brief Adds a button to this Popup.
@@ -257,14 +249,14 @@ public: // Not intended for application developers
    *
    * @param[in]  implementation  The Control implementation.
    */
-  Popup(Internal::Popup& implementation);
+  DALI_INTERNAL Popup(Internal::Popup& implementation);
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  Popup( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL Popup( Dali::Internal::CustomActor* internal );
 };
 
 } // namespace Toolkit