From fa86d00f5d97d5d7aaf936f83e217c730347c766 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Fri, 18 May 2018 10:04:37 +0900 Subject: [PATCH] Revert "[Tizen] Fix can't call GetInputMethodContext api issue" This reverts commit bcafa3b79c5344d96b560a3f33177db64e75bb21. Change-Id: I175e6d3d44cb62cb56dd6bbd231e9e65a4d74012 --- .../devel-api/controls/text-controls/text-editor-devel.cpp | 9 +++++++-- .../devel-api/controls/text-controls/text-editor-devel.h | 2 +- .../devel-api/controls/text-controls/text-field-devel.cpp | 7 ++++++- dali-toolkit/devel-api/controls/text-controls/text-field-devel.h | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.cpp b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.cpp index 97ee0fa..875e270 100755 --- a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.cpp +++ b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.cpp @@ -1,5 +1,8 @@ +#ifndef DALI_TOOLKIT_TEXT_EDITOR_DEVEL_H +#define DALI_TOOLKIT_TEXT_EDITOR_DEVEL_H + /* - * Copyright (c) 2018 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. @@ -37,4 +40,6 @@ InputMethodContext GetInputMethodContext( TextEditor textEditor ) } // namespace Toolkit -} // namespace Dali \ No newline at end of file +} // namespace Dali + +#endif // DALI_TOOLKIT_TEXT_EDITOR_DEVEL_H diff --git a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h index bf2b106..fd2d4bb 100755 --- a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_TEXT_EDITOR_DEVEL_H /* - * Copyright (c) 2018 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. diff --git a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.cpp b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.cpp index f9b739c..c73bb5e 100755 --- a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.cpp +++ b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.cpp @@ -1,5 +1,8 @@ +#ifndef DALI_TOOLKIT_TEXT_FIELD_DEVEL_H +#define DALI_TOOLKIT_TEXT_FIELD_DEVEL_H + /* - * Copyright (c) 2018 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. @@ -38,3 +41,5 @@ InputMethodContext GetInputMethodContext( TextField textField ) } // namespace Toolkit } // namespace Dali + +#endif // DALI_TOOLKIT_TEXT_FIELD_DEVEL_H diff --git a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h index 0f99c16..5075358 100755 --- a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_TEXT_FIELD_DEVEL_H /* - * Copyright (c) 2018 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. -- 2.7.4