Conversion to Apache 2.0 license

[platform/core/uifw/dali-toolkit.git] / optional / dali-toolkit / internal / controls / view / view-impl.h

diff --git a/optional/dali-toolkit/internal/controls/view/view-impl.h b/optional/dali-toolkit/internal/controls/view/view-impl.h
index 7843583..3531149 100644 (file)
--- a/optional/dali-toolkit/internal/controls/view/view-impl.h
+++ b/optional/dali-toolkit/internal/controls/view/view-impl.h
@@ -40,7 +40,7 @@ namespace Internal
  * View is a control to add layers and a background.
  * @see Dali::Toolkit::View for more details.
  */
  * View is a control to add layers and a background.
  * @see Dali::Toolkit::View for more details.
  */

-class View : public ControlImpl
+class View : public Control

 {
 private:
   typedef std::map<unsigned int,Layer> LayerContainer;
 {
 private:
   typedef std::map<unsigned int,Layer> LayerContainer;


@@ -128,7 +128,7 @@ public:
    */
   static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
 
    */
   static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
 

-private: // From ControlImpl
+private: // From Control

 
   /**
    * @copydoc Toolkit::Control::OnInitialize()
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()