Merge "Added API flags into the control-wrapper files." into devel/master

diff --git a/dali-toolkit/devel-api/controls/control-wrapper-impl.h b/dali-toolkit/devel-api/controls/control-wrapper-impl.h
index 787fa89..fa9173f 100755 (executable)
--- a/dali-toolkit/devel-api/controls/control-wrapper-impl.h
+++ b/dali-toolkit/devel-api/controls/control-wrapper-impl.h
@@ -38,7 +38,7 @@ typedef IntrusivePtr< ControlWrapper > ControlWrapperPtr;
 /**
  * @copydoc Toolkit::ControlWrapper
  */
-class ControlWrapper : public Control
+class DALI_IMPORT_API ControlWrapper : public Control
 {
 public:
 
@@ -157,12 +157,13 @@ protected:
 
 private:
 
-  // Undefined.
-  ControlWrapper( const ControlWrapper& );
-
-  // Undefined.
-  ControlWrapper& operator=( const ControlWrapper& rhs );
+  /// @cond internal
+  /// Undefined.
+  DALI_INTERNAL ControlWrapper( const ControlWrapper& );
 
+  /// Undefined.
+  DALI_INTERNAL ControlWrapper& operator=( const ControlWrapper& rhs );
+  /// @endcond
 };
 
 } // namespace Internal

diff --git a/dali-toolkit/devel-api/controls/control-wrapper.h b/dali-toolkit/devel-api/controls/control-wrapper.h
index a9aacc5..a45c4b5 100644 (file)
--- a/dali-toolkit/devel-api/controls/control-wrapper.h
+++ b/dali-toolkit/devel-api/controls/control-wrapper.h
@@ -95,14 +95,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