X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=base%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fpopup%2Fpopup.h;h=55d05c1262cd05173b7c2ffb57212f3ef5e5c411;hb=93fb6a1d3dc8872275bde30ef6a05407a67d694c;hp=480613721be76032f90ddd3b78cf2b08bfb95071;hpb=a544935a60770da7a421b604a9e85afac71ad6b9;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 --- 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 -#include -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