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

apply C++17 folding expression

Browse Source
This commit is contained in:
Jinhao 2017-12-20 11:53:29 +08:00
parent 9d75d15474
commit c66895ead6
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/nana/gui/msgbox.hpp
View File

@ -240,7 +240,11 @@ namespace nana
bool show(Args&& ... args) bool show(Args&& ... args)
{ {
std::vector<abstract_content*> contents; std::vector<abstract_content*> contents;
#ifdef _nana_cxx_folding_expression
(contents.emplace_back(&args), ...);
#else
_m_fetch_args(contents, std::forward<Args>(args)...); _m_fetch_args(contents, std::forward<Args>(args)...);
#endif
if (contents.empty()) if (contents.empty())
return false; return false;
@ -270,6 +274,7 @@ namespace nana
void min_width_entry_field( unsigned pixels ); void min_width_entry_field( unsigned pixels );
private: private:
#ifndef _nana_cxx_folding_expression
void _m_fetch_args(std::vector<abstract_content*>&); void _m_fetch_args(std::vector<abstract_content*>&);
template<typename ...Args> template<typename ...Args>
@ -278,6 +283,7 @@ namespace nana
contents.push_back(&content); contents.push_back(&content);
_m_fetch_args(contents, std::forward<Args>(args)...); _m_fetch_args(contents, std::forward<Args>(args)...);
} }
#endif
bool _m_open(std::vector<abstract_content*>&, bool modal); bool _m_open(std::vector<abstract_content*>&, bool modal);
private: private:

2
source/gui/msgbox.cpp
View File

@ -1294,8 +1294,10 @@ namespace nana
min_width_entry_field_pixels_ = pixels; min_width_entry_field_pixels_ = pixels;
} }
#ifndef _nana_cxx_folding_expression
void inputbox::_m_fetch_args(std::vector<abstract_content*>&) void inputbox::_m_fetch_args(std::vector<abstract_content*>&)
{} {}
#endif
bool inputbox::_m_open(std::vector<abstract_content*>& contents, bool modal) bool inputbox::_m_open(std::vector<abstract_content*>& contents, bool modal)
{ {