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
Remove incorrect placement actor from the RegisterVisual API
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
buttons
/
radio-button.cpp
diff --git
a/dali-toolkit/public-api/controls/buttons/radio-button.cpp
b/dali-toolkit/public-api/controls/buttons/radio-button.cpp
index
c698225
..
0802b74
100644
(file)
--- a/
dali-toolkit/public-api/controls/buttons/radio-button.cpp
+++ b/
dali-toolkit/public-api/controls/buttons/radio-button.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
5
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.
@@
-71,14
+71,7
@@
RadioButton RadioButton::New()
RadioButton RadioButton::New( const std::string& label )
{
RadioButton radioButton = Internal::RadioButton::New();
RadioButton RadioButton::New( const std::string& label )
{
RadioButton radioButton = Internal::RadioButton::New();
- radioButton.SetLabel( label );
- return radioButton;
-}
-
-RadioButton RadioButton::New( Actor label )
-{
- RadioButton radioButton = Internal::RadioButton::New();
- radioButton.SetLabel( label );
+ radioButton.SetLabelText( label );
return radioButton;
}
return radioButton;
}