From 371d3bc4c2e1b41e5a4f78df19048cbeaf0237b1 Mon Sep 17 00:00:00 2001 From: Dongsug Song Date: Fri, 17 Jul 2020 08:46:30 +0900 Subject: [PATCH] Revert "[Tizen] Restore OnControlChildAdd and OnControlChildRemove" - This was workaround patch to fix CSFS not shown issue, but this was resolved by rebuilding dali-extension-tv module. - This is not required and need to be reverted. This reverts commit 078980aea975d398c7e6eb24387d5beb1255a435. Change-Id: I9142922a52be3eee1b9b7f0992ddb7705b4cc733 --- dali-toolkit/public-api/controls/control-impl.cpp | 8 -------- dali-toolkit/public-api/controls/control-impl.h | 24 ----------------------- 2 files changed, 32 deletions(-) diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 817a3b7..f17092f 100755 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -473,14 +473,6 @@ void Control::OnInitialize() { } -void Control::OnControlChildAdd( Actor& child ) -{ -} - -void Control::OnControlChildRemove( Actor& child ) -{ -} - void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) { // By default the control is only interested in theme (not font) changes diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index a4706af..56c358d 100644 --- a/dali-toolkit/public-api/controls/control-impl.h +++ b/dali-toolkit/public-api/controls/control-impl.h @@ -450,30 +450,6 @@ public: // API for derived classes to override */ virtual void OnInitialize(); - /** - * @DEPRECATED_1_1.30. Override OnChildAdd instead. - * - * @brief Called whenever an Actor is added to the control. - * - * Could be overridden by derived classes. - * - * @SINCE_1_0.0 - * @param[in] child The added actor - */ - virtual void OnControlChildAdd( Actor& child ) DALI_DEPRECATED_API; - - /** - * @DEPRECATED_1_1.30. Override OnChildRemove instead. - * - * @brief Called whenever an Actor is removed from the control. - * - * Could be overridden by derived classes. - * - * @SINCE_1_0.0 - * @param[in] child The removed actor - */ - virtual void OnControlChildRemove( Actor& child ) DALI_DEPRECATED_API; - // Styling /** -- 2.7.4