Merge remote-tracking branch 'cnjinhao/develop' into develop

include/nana/gui/basis.hpp

@@ -91,6 +91,8 @@ namespace nana
 			substitute = 0x1A,	//Ctrl+Z
 			escape = 0x1B,
 			space = 0x20,	//Space
+			del = 0x7F,		//Delete
+			os_del = del,	//Deprecated
 
 			//The following names are intuitive name of ASCII control codes
 			select_all = start_of_headline,
@@ -106,8 +108,8 @@ namespace nana
 			os_ctrl = 0x11,
 			os_pageup = 0x21, os_pagedown,
 			os_arrow_left = 0x25, os_arrow_up, os_arrow_right, os_arrow_down,
-			os_insert = 0x2D, os_del ,
-            os_end = 0x23   , os_home //Pos 1
+			os_insert = 0x2D,
+            os_end = 0x23, os_home //Pos 1
 		};
 	};
 

include/nana/gui/widgets/spinbox.hpp

@@ -61,6 +61,7 @@ namespace nana
 
 				void focus(graph_reference, const arg_focus&)	override;
 				void mouse_wheel(graph_reference, const arg_wheel&) override;
+				void dbl_click(graph_reference, const arg_mouse&) override;
 				void mouse_down(graph_reference, const arg_mouse&)	override;
 				void mouse_move(graph_reference, const arg_mouse&)	override;
 				void mouse_up(graph_reference, const arg_mouse& arg)	override;

include/nana/gui/widgets/textbox.hpp

@@ -185,7 +185,7 @@ namespace nana
 
         /// Appends an string. If `at_caret` is `true`, the string is inserted at the position of caret, otherwise, it is appended at end of the textbox.
 		textbox& append(const std::string& text, bool at_caret);
-
+        textbox& append(const std::wstring& text, bool at_caret);
 		/// Determines whether the text is line wrapped.
 		bool line_wrapped() const;
 		textbox& line_wrapped(bool);

include/nana/std_mutex.hpp

@@ -14,8 +14,12 @@
 #include <cstdio>
 // http://lxr.free-electrons.com/source/include/uapi/asm-generic/errno.h#L53
 //#define EPROTO          71      /* Protocol error */
+#ifdef _GLIBCXX_HAS_GTHREADS
+#    include <thread>
+#else
 #include <mingw.thread.h>
 #include <mingw.mutex.h>
+#endif
 #else
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/recursive_mutex.hpp>

include/nana/std_thread.hpp

@@ -6,7 +6,11 @@
 
 #if defined(NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ)
 
-#include <mingw.thread.h>
+#ifdef _GLIBCXX_HAS_GTHREADS
+#    include <thread>
+#else
+#    include <mingw.thread.h>
+#endif
 #else
 #include <boost/thread.hpp>
 namespace std