Merge branch 'master' into develop

2016-02-16 23:50:45 +08:00
parent 7aa9d9e373 1f5eb29b72
commit e195ae8469
13 changed files with 341 additions and 114 deletions
--- a/source/gui/widgets/group.cpp
+++ b/source/gui/widgets/group.cpp
@@ -103,7 +103,7 @@ namespace nana{
 		delete impl_->radio_logic;
 	}

-	group& group::add_option(std::string text)
+	checkbox& group::add_option(std::string text)
 	{
 		_THROW_IF_EMPTY()

@@ -118,7 +118,7 @@ namespace nana{
 		if (impl_->radio_logic)
 			impl_->radio_logic->add(*opt);

-		return *this;
+		return *impl_->options.back();
 	}

 	group& group::radio_mode(bool enable)