Changed Control::SetLayout to handle empty layouts

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

diff --git a/dali-toolkit/devel-api/controls/control-wrapper.h b/dali-toolkit/devel-api/controls/control-wrapper.h
index a9aacc5..fecab4f 100644 (file)
--- a/dali-toolkit/devel-api/controls/control-wrapper.h
+++ b/dali-toolkit/devel-api/controls/control-wrapper.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_CONTROL_WRAPPER_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -37,7 +37,7 @@ class ControlWrapper;
  *
  * The implementation of the ControlWrapper must be supplied; see Internal::ControlWrapper for more details.
  */
-class DALI_IMPORT_API ControlWrapper : public Control
+class DALI_TOOLKIT_API ControlWrapper : public Control
 {
 
 public:
@@ -45,9 +45,12 @@ public:
   /**
    * @brief Create a new instance of a ControlWrapper.
    *
+   * @param[in] typeName The name of the type that is registered with this control
+   * @param[in] implementation The implementation of this control
+   *
    * @return A handle to a new ControlWrapper.
    */
-  static ControlWrapper New( Internal::ControlWrapper& implementation );
+  static ControlWrapper New( const std::string& typeName, Internal::ControlWrapper& implementation );
 
   /**
    * @brief Creates an empty ControlWrapper handle.
@@ -95,14 +98,14 @@ public: // Not intended for application developers
    *
    * @param[in]  implementation  The Control implementation.
    */
-  DALI_INTERNAL ControlWrapper( Internal::ControlWrapper& implementation );
+  ControlWrapper( Internal::ControlWrapper& implementation );
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  explicit DALI_INTERNAL ControlWrapper( Dali::Internal::CustomActor* internal );
+  explicit ControlWrapper( Dali::Internal::CustomActor* internal );
 };
 
 } // namespace Toolkit