mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop-c++17' into develop

Browse Source
This commit is contained in:
Jinhao
2018-06-04 02:29:55 +08:00
parent d5f8f8b305 163223e46f
commit a9f23e2503
35 changed files with 270 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/gui/widgets/widget.cpp
View File

@@ -54,12 +54,12 @@ namespace nana
widget& wdg_;
};
std::string widget::caption() const throw()
std::string widget::caption() const noexcept
{
return to_utf8(_m_caption());
}
std::wstring widget::caption_wstring() const throw()
std::wstring widget::caption_wstring() const noexcept
{
#if defined(NANA_WINDOWS)
return _m_caption();
@@ -68,7 +68,7 @@ namespace nana
#endif
}
auto widget::caption_native() const throw() -> native_string_type
auto widget::caption_native() const noexcept -> native_string_type
{
return _m_caption();
}
@@ -287,7 +287,7 @@ namespace nana
void widget::_m_complete_creation()
{}
auto widget::_m_caption() const throw() -> native_string_type
auto widget::_m_caption() const noexcept -> native_string_type
{
return API::dev::window_caption(handle());
}