Merge branch 'tizen' into new_text

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / controls / text-input / text-input-decorator-impl.h

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h
index 087cde3..7d316da 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h
@@ -1,26 +1,33 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_TEXT_INPUT_DECORATOR_H__
 #define __DALI_TOOLKIT_INTERNAL_TEXT_INPUT_DECORATOR_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#include <dali/dali.h>
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
-// INTERNAL INCLUDES
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/actors/mesh-actor.h>
+#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/common/intrusive-ptr.h>
+#include <dali/public-api/geometry/mesh.h>
+#include <dali/public-api/signals/connection-tracker.h>
 
+// INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/text-input/textview-character-positions-impl.h>
 #include <dali-toolkit/internal/controls/text-input/text-input-handles-impl.h>
 #include <dali-toolkit/internal/controls/text-input/text-input-text-highlight-impl.h>
@@ -100,7 +107,7 @@ public:
    * @param actor Handle of the selection or grab handle.
    * @param gesture Data structure with the parameters of the gesture.
    */
-  void OnHandlePan(Actor actor, PanGesture gesture);
+  void OnHandlePan(Actor actor, const PanGesture& gesture);
 
   // Selection Handles
 
@@ -162,12 +169,6 @@ public:
   void SetSelectionHandlesVisibility( bool visible );
 
   /**
-   * @brief Callback for when a handle is released
-   * @return bool
-   */
-  bool OnHandleReleased();
-
-  /**
    * @brief Position Selection handles at given positions within the text string.
    *
    * @param[in] start where to place first handle
@@ -631,5 +632,3 @@ private:
 } // namespace Dali
 
 #endif // __DALI_TOOLKIT_INTERNAL_TEXT_INPUT_DECORATOR_H__
-
-