projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_1.9.23] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
text-controls
/
text-editor.cpp
diff --git
a/dali-toolkit/public-api/controls/text-controls/text-editor.cpp
b/dali-toolkit/public-api/controls/text-controls/text-editor.cpp
index
4098e8b
..
f3c26f9
100644
(file)
--- a/
dali-toolkit/public-api/controls/text-controls/text-editor.cpp
+++ b/
dali-toolkit/public-api/controls/text-controls/text-editor.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
16
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-36,19
+36,13
@@
TextEditor::TextEditor()
{
}
{
}
-TextEditor::TextEditor( const TextEditor& handle )
-: Control( handle )
-{
-}
+TextEditor::TextEditor( const TextEditor& handle ) = default;
-TextEditor& TextEditor::operator=( const TextEditor& handle )
-{
- if( &handle != this )
- {
- Control::operator=( handle );
- }
- return *this;
-}
+TextEditor::TextEditor( TextEditor&& rhs ) = default;
+
+TextEditor& TextEditor::operator=( const TextEditor& handle ) = default;
+
+TextEditor& TextEditor::operator=( TextEditor&& rhs ) = default;
TextEditor::~TextEditor()
{
TextEditor::~TextEditor()
{
@@
-69,6
+63,12
@@
TextEditor::InputStyleChangedSignalType& TextEditor::InputStyleChangedSignal()
return Dali::Toolkit::GetImpl( *this ).InputStyleChangedSignal();
}
return Dali::Toolkit::GetImpl( *this ).InputStyleChangedSignal();
}
+
+TextEditor::ScrollStateChangedSignalType& TextEditor::ScrollStateChangedSignal()
+{
+ return Dali::Toolkit::GetImpl( *this ).ScrollStateChangedSignal();
+}
+
TextEditor::TextEditor( Internal::TextEditor& implementation )
: Control( implementation )
{
TextEditor::TextEditor( Internal::TextEditor& implementation )
: Control( implementation )
{