Merge "Note that some Text propeties in devel api can't be changed" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / control-wrapper-impl.h

diff --git a/dali-toolkit/devel-api/controls/control-wrapper-impl.h b/dali-toolkit/devel-api/controls/control-wrapper-impl.h
index fa9173f..e5c371d 100755 (executable)
--- a/dali-toolkit/devel-api/controls/control-wrapper-impl.h
+++ b/dali-toolkit/devel-api/controls/control-wrapper-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_CONTROL_WRAPPER_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,13 @@ namespace Dali
 namespace Toolkit
 {
 
+class TransitionData;
+
+namespace Visual
+{
+class Base;
+}
+
 namespace Internal
 {
 
@@ -64,9 +71,13 @@ public:
 
   /**
    * Create a new ControlWrapper.
+   *
+   * @param[in] typeName The name of the type that is registered with this control
+   * @param[in] controlWrapper The implementation of this control
+   *
    * @return A public handle to the newly allocated ControlWrapper.
    */
-  static Dali::Toolkit::ControlWrapper New( ControlWrapper* controlWrapper );
+  static Dali::Toolkit::ControlWrapper New( const std::string& typeName, ControlWrapper* controlWrapper );
 
 public: // From CustomActorImpl
 
@@ -100,37 +111,47 @@ public: // From CustomActorImpl
 public: // From Control
 
   /**
-   * @copydoc Dali::Toolkit::Internal::Control::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual )
+   * @ref Dali::Toolkit::DevelControl::RegisterVisual()
    */
   void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual );
 
   /**
-   * @copydoc Dali::Toolkit::Internal::Control::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled )
+   * @ref Dali::Toolkit::DevelControl::RegisterVisual()
+   */
+  void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, int depthIndex );
+
+  /**
+   * @ref Dali::Toolkit::DevelControl::RegisterVisual()
    */
   void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled );
 
   /**
-   * @copydoc Dali::Toolkit::Internal::Control::UnregisterVisual()
+   * @ref Dali::Toolkit::DevelControl::RegisterVisual()
+   */
+  void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled, int depthIndex );
+
+  /**
+   * @ref Dali::Toolkit::DevelControl::UnregisterVisual()
    */
   void UnregisterVisual( Property::Index index );
 
   /**
-   * @copydoc Dali::Toolkit::Internal::Control::GetVisual()
+   * @ref Dali::Toolkit::DevelControl::GetVisual()
    */
   Toolkit::Visual::Base GetVisual( Property::Index index ) const;
 
   /**
-   * @copydoc Dali::Toolkit::Internal::Control::EnableVisual()
+   * @ref Dali::Toolkit::DevelControl::EnableVisual()
    */
   void EnableVisual( Property::Index index, bool enable );
 
   /**
-   * @copydoc Dali::Toolkit::Internal::Control::IsVisualEnabled()
+   * @ref Dali::Toolkit::DevelControl::IsVisualEnabled()
    */
   bool IsVisualEnabled( Property::Index index ) const;
 
   /**
-   * @copydoc Dali::Toolkit::Internal::Control::CreateTransition()
+   * @ref Dali::Toolkit::DevelControl::CreateTransition()
    */
   Dali::Animation CreateTransition( const Toolkit::TransitionData& transitionData );
 
@@ -147,6 +168,13 @@ public: // From Control
    */
   void ApplyThemeStyle();
 
+public:
+  /**
+   * Enable access to non-native type info from native side
+   * @return The type info that was registered on this type
+   */
+  Dali::TypeInfo GetTypeInfo();
+
 protected:
 
   /**