X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=optional%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fmagnifier%2Fmagnifier.h;h=4538f81421faa910441109432ce2c1809dc2efe0;hp=7aad6366bc3984bd587ec6ad5ae5908556f4b45c;hb=42eeffaa69044c2236996eb543416486ae92335c;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836 diff --git a/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h b/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h index 7aad636..4538f81 100644 --- a/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h +++ b/optional/dali-toolkit/public-api/controls/magnifier/magnifier.h @@ -23,7 +23,7 @@ // INTERNAL INCLUDES #include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Toolkit @@ -41,7 +41,7 @@ class Magnifier; * to the stage as a separate overlay. In addition to the contents, an optional frame * is displayed around the magnified contents. */ -class Magnifier : public Control +class DALI_IMPORT_API Magnifier : public Control { public: @@ -68,10 +68,11 @@ public: Magnifier& operator=( const Magnifier& handle ); /** - * Virtual destructor. - * Dali::Object derived classes typically do not contain member data. + * @brief Destructor + * + * This is non-virtual since derived Handle types must not contain data or virtual methods. */ - virtual ~Magnifier(); + ~Magnifier(); /** * Create the Poup control @@ -142,7 +143,7 @@ public: // Not intended for application developers * Allows the creation of this Control from an Internal::CustomActor pointer. * @param[in] internal A pointer to the internal CustomActor. */ - DALI_INTERNAL Magnifier(Dali::Internal::CustomActor* internal); + explicit DALI_INTERNAL Magnifier(Dali::Internal::CustomActor* internal); }; } // namespace Toolkit