X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.h;h=a441b072a479e24ec6ffbd7cf447329da55e77c3;hb=bd8d301b9d1df9d7fbae922ecaf3eda793099a0b;hp=8133b268b5705533632058384299ee6c7cb57575;hpb=dc3613bb6248908c267a76e378b04962bce85664;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index 8133b26..a441b07 100644 --- a/dali-toolkit/public-api/controls/control-impl.h +++ b/dali-toolkit/public-api/controls/control-impl.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include // INTERNAL INCLUDES @@ -62,13 +62,6 @@ class DALI_IMPORT_API Control : public CustomActorImpl, public ConnectionTracker { public: - // Properties - enum - { - CONTROL_PROPERTY_START_INDEX = PROPERTY_REGISTRATION_START_INDEX, - CONTROL_PROPERTY_END_INDEX = CONTROL_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices - }; - // Creation & Destruction /** @@ -653,11 +646,6 @@ private: */ virtual bool OnMouseWheelEvent(const MouseWheelEvent& event); - /** - * @copydoc Dali::CustomActorImpl::GetChildByAlias(const std::string& actorAlias) - */ - virtual Actor GetChildByAlias(const std::string& actorAlias); - // From CustomActorImpl, derived classes should NOT override these. /**