X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fpopup%2Fpopup.h;h=5bfaac91c207c559679f2bb3356f9230b557b37d;hp=480613721be76032f90ddd3b78cf2b08bfb95071;hb=42eeffaa69044c2236996eb543416486ae92335c;hpb=2fff97772366d0fdfe3fb78cf3c49b8ecd577a03 diff --git a/base/dali-toolkit/public-api/controls/popup/popup.h b/base/dali-toolkit/public-api/controls/popup/popup.h index 4806137..5bfaac9 100644 --- a/base/dali-toolkit/public-api/controls/popup/popup.h +++ b/base/dali-toolkit/public-api/controls/popup/popup.h @@ -22,7 +22,7 @@ #include #include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Toolkit @@ -63,7 +63,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: @@ -257,14 +257,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