Revert "Add RelayoutRequest on Control"

This reverts commit 71c03dad71835226d820f790dbc53f5c538ec65c.

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
index 7a33599..17db11b 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -383,12 +383,6 @@ bool Control::EmitKeyEventSignal(const KeyEvent& event)
   return consumed;
 }
 
   return consumed;
 }
 

-void Control::RelayoutRequest()
-{
-  CustomActorImpl::RelayoutRequest();
-}
-
-

 Control::Control(ControlBehaviour behaviourFlags)
 : CustomActorImpl(static_cast<ActorFlags>(behaviourFlags)),
   mImpl(new Impl(*this))
 Control::Control(ControlBehaviour behaviourFlags)
 : CustomActorImpl(static_cast<ActorFlags>(behaviourFlags)),
   mImpl(new Impl(*this))

diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h
index 9d6feac..9a68ca1 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.h
+++ b/dali-toolkit/public-api/controls/control-impl.h
@@ -105,11 +105,6 @@ public:
   void SetBackground(const Property::Map& map);
 
   /**
   void SetBackground(const Property::Map& map);
 
   /**

-   * @copydoc Dali::CustomActorImpl::RelayoutRequest()
-   */
-  void RelayoutRequest();
-
-  /**

    * @copydoc Dali::Toolkit::Control::ClearBackground
    */
   void ClearBackground();
    * @copydoc Dali::Toolkit::Control::ClearBackground
    */
   void ClearBackground();