Merge branch 'nana_exp_filesystem' of https://github.com/qPCR4vir/nana into qPCR4vir-nana_exp_filesystem

2015-06-10 07:03:11 +08:00
parent e8ae11e208 42819c64c2
commit 8ba39c7a75
9 changed files with 967 additions and 6 deletions
--- a/source/gui/widgets/combox.cpp
+++ b/source/gui/widgets/combox.cpp
@@ -18,6 +18,8 @@
 #include <nana/gui/widgets/skeletons/text_editor.hpp>
 #include <nana/gui/widgets/skeletons/textbase_export_interface.hpp>

+#include <iterator>
+
 namespace nana
 {
 	arg_combox::arg_combox(combox& wdg): widget(wdg)