From d5721fbe30513a0136a61454184657628c6f804a Mon Sep 17 00:00:00 2001
From: qPCR4vir <arielvina@yahoo.es>
Date: Mon, 14 Dec 2015 01:44:22 +0100
Subject: [PATCH 01/13] STD_make_unique_NOT_SUPPORTED "Add support for
 make_unique<>()."

---
 CMakeLists.txt                 |  9 ++++++++
 include/nana/config.hpp        |  6 ++++-
 include/nana/deploy.hpp        | 40 ++++++++++++++++++++++++++++++++++
 source/gui/widgets/listbox.cpp |  4 ++--
 4 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b65dadc..99af4a08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,9 @@
 #	Robert Hauck - Enable support for PNG/Freetype
 #   Qiangqiang Wu - Add biicode support
 
+option(CMAKE_STD_make_unique_NOT_SUPPORTED "Add support for make_unique<>().")
+#set(CMAKE_STD_make_unique_NOT_SUPPORTED OFF)
+
 # set compile  flags
 if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
@@ -96,6 +99,12 @@ endif()
 
 
 
+# STD_make_unique_NOT_SUPPORTED
+if(CMAKE_STD_make_unique_NOT_SUPPORTED)
+    add_definitions(-DSTD_make_unique_NOT_SUPPORTED)
+endif(CMAKE_STD_make_unique_NOT_SUPPORTED)
+
+
 set(NANA_SOURCE_DIR ${CMAKE_SOURCE_DIR}/source)
 set(NANA_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
 
diff --git a/include/nana/config.hpp b/include/nana/config.hpp
index e97c70f6..b580adb0 100644
--- a/include/nana/config.hpp
+++ b/include/nana/config.hpp
@@ -82,7 +82,7 @@
 	#endif
 
 	#if (__GNUC__ == 4)
-		#if ((__GNUC_MINOR__ < 8) || (__GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ < 1))
+		#if ((__GNUC_MINOR__ < 8) || (__GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ <= 1))
 			#define STD_THREAD_NOT_SUPPORTED
 
 			//boost.thread is preferred
@@ -90,6 +90,10 @@
 			//boost.thread will be replaced with meganz's mingw-std-threads.
 			// https://github.com/meganz/mingw-std-threads
 			//#define USE_github_com_meganz_mingw_std_threads
+			#if !defined(STD_make_unique_NOT_SUPPORTED)
+				#define STD_make_unique_NOT_SUPPORTED
+			#endif	//STD_make_unique_NOT_SUPPORTED
+
 		#endif
 
 		#if defined(NANA_MINGW)
diff --git a/include/nana/deploy.hpp b/include/nana/deploy.hpp
index 30d87935..f10dbebc 100644
--- a/include/nana/deploy.hpp
+++ b/include/nana/deploy.hpp
@@ -142,4 +142,44 @@ namespace nana
 #define NANA_RGB(a)	(((DWORD)(a) & 0xFF)<<16) |  ((DWORD)(a) & 0xFF00) | (((DWORD)(a) & 0xFF0000) >> 16 )
 
 
+#if defined(STD_make_unique_NOT_SUPPORTED)
+// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3656.htm
+
+#include <cstddef>
+#include <memory>
+#include <type_traits>
+#include <utility>
+
+namespace std {
+	template<class T> struct _Unique_if {
+		typedef unique_ptr<T> _Single_object;
+	};
+
+	template<class T> struct _Unique_if<T[]> {
+		typedef unique_ptr<T[]> _Unknown_bound;
+	};
+
+	template<class T, size_t N> struct _Unique_if<T[N]> {
+		typedef void _Known_bound;
+	};
+
+	template<class T, class... Args>
+	typename _Unique_if<T>::_Single_object
+	make_unique(Args&&... args) {
+		return unique_ptr<T>(new T(std::forward<Args>(args)...));
+	}
+
+	template<class T>
+	typename _Unique_if<T>::_Unknown_bound
+	make_unique(size_t n) {
+		typedef typename remove_extent<T>::type U;
+		return unique_ptr<T>(new U[n]());
+	}
+
+	template<class T, class... Args>
+	typename _Unique_if<T>::_Known_bound
+			make_unique(Args&&...) = delete;
+}
+#endif //STD_make_unique_NOT_SUPPORTED
+
 #endif //NANA_MACROS_HPP
diff --git a/source/gui/widgets/listbox.cpp b/source/gui/widgets/listbox.cpp
index ef8b18a0..3da06cf2 100644
--- a/source/gui/widgets/listbox.cpp
+++ b/source/gui/widgets/listbox.cpp
@@ -58,12 +58,12 @@ namespace nana
 
 				cell::cell(nana::string text, const format& fmt)
 					:	text(std::move(text)),
-						custom_format(new format{ fmt })	//make_unique
+						custom_format(std::make_unique<format>( fmt ))	// or  custom_format(new format{ fmt })
 				{}
 
 				cell::cell(nana::string text, const ::nana::color& bgcolor, const ::nana::color& fgcolor)
 					:	text(std::move(text)),
-						custom_format{ new format{ bgcolor, fgcolor } }	//make_unique
+						custom_format{std::make_unique<format>( bgcolor, fgcolor ) }	//custom_format{ new format{ bgcolor, fgcolor } }
 				{}
 
 				cell& cell::operator=(const cell& rhs)

From f59afb9aa421ac065d5610e3b11ec0f1b39d8192 Mon Sep 17 00:00:00 2001
From: qPCR4vir <arielvina@yahoo.es>
Date: Mon, 14 Dec 2015 01:49:47 +0100
Subject: [PATCH 02/13] Build demos

---
 CMakeLists.txt | 69 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 66 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99af4a08..15bcb6c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,7 @@
 #	Robert Hauck - Enable support for PNG/Freetype
 #   Qiangqiang Wu - Add biicode support
 
+option(BUILD_NANA_DEMOS "Build all the demos form the nana_demo repository." ON)
 option(CMAKE_STD_make_unique_NOT_SUPPORTED "Add support for make_unique<>().")
 #set(CMAKE_STD_make_unique_NOT_SUPPORTED OFF)
 
@@ -148,10 +149,72 @@ target_link_libraries(${PROJECT_NAME} -L/opt/X11/lib/ -lX11 -lXft -lpng -liconv)
 install(TARGETS ${PROJECT_NAME}
             ARCHIVE DESTINATION lib
             LIBRARY DESTINATION lib)
+# ??
 install(DIRECTORY ${NANA_INCLUDE_DIR}/nana DESTINATION include)
 
 set_property( TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 14 )
 
-add_executable(nana_test test.cpp)
-set_property( TARGET nana_test PROPERTY CXX_STANDARD 14 )
-target_link_libraries(nana_test ${PROJECT_NAME})
+if (BUILD_NANA_DEMOS)
+    set (CMAKE_INSTALL_PREFIX ${DEMO_BIN})
+    set(DEMO_BIN ${NANA_SOURCE_DIR}../nana-demo/bin)
+    set(CMAKE_INSTALL_PREFIX )
+    add_executable(file_explorer ../nana-demo/file_explorer.cpp)
+    set_property( TARGET file_explorer PROPERTY CXX_STANDARD 14 )
+    target_link_libraries(file_explorer ${PROJECT_NAME})
+    install(TARGETS file_explorer RUNTIME DESTINATION &{DEMO_BIN})
+
+    add_executable(calculator ../nana-demo/calculator.cpp)
+    set_property( TARGET calculator PROPERTY CXX_STANDARD 14 )
+    target_link_libraries(calculator ${PROJECT_NAME})
+    install(TARGETS calculator RUNTIME DESTINATION &{DEMO_BIN})
+
+    add_executable(FreeMe ../nana-demo/FreeMe.cpp)
+    set_property( TARGET FreeMe PROPERTY CXX_STANDARD 14 )
+    target_link_libraries(FreeMe ${PROJECT_NAME})
+    install(TARGETS FreeMe RUNTIME DESTINATION &{DEMO_BIN})
+
+    add_executable(notepad ../nana-demo/notepad.cpp)
+    set_property( TARGET notepad PROPERTY CXX_STANDARD 14 )
+    target_link_libraries(notepad ${PROJECT_NAME})
+    install(TARGETS notepad RUNTIME DESTINATION &{DEMO_BIN})
+
+    add_executable(widget_show ../nana-demo/widget_show.cpp)
+    set_property( TARGET widget_show PROPERTY CXX_STANDARD 14 )
+    target_link_libraries(widget_show ${PROJECT_NAME})
+    install(TARGETS widget_show RUNTIME DESTINATION &{DEMO_BIN})
+
+    add_executable(widget_show2 ../nana-demo/widget_show2.cpp)
+    set_property( TARGET widget_show2 PROPERTY CXX_STANDARD 14 )
+    target_link_libraries(widget_show2 ${PROJECT_NAME})
+    install(TARGETS widget_show2 RUNTIME DESTINATION &{DEMO_BIN})
+
+    add_executable(a_group_impl ../nana-demo/Examples/a_group_impl.cpp)
+    set_property( TARGET a_group_impl PROPERTY CXX_STANDARD 14 )
+    target_link_libraries(a_group_impl ${PROJECT_NAME})
+
+    add_executable(animate-bmp ../nana-demo/Examples/animate-bmp.cpp)
+    set_property( TARGET animate-bmp PROPERTY CXX_STANDARD 14 )
+    target_link_libraries(animate-bmp ${PROJECT_NAME})
+
+    add_executable(audio_player ../nana-demo/Examples/audio_player.cpp)
+    set_property( TARGET audio_player PROPERTY CXX_STANDARD 14 )
+    target_link_libraries(audio_player ${PROJECT_NAME})
+
+
+    #add_executable(nana_test test.cpp)
+    #set_property( TARGET nana_test PROPERTY CXX_STANDARD 14 )
+    #target_link_libraries(nana_test ${PROJECT_NAME})
+
+   #set(NANA_DEMOS_DIR ${CMAKE_SOURCE_DIR}/../nana-demo)
+   #set(NANA_EXAMPLES_DIR ${CMAKE_SOURCE_DIR}/../Examples/nana-demo/)
+    # https://cmake.org/cmake/help/v3.3/command/file.html?highlight=glob#file
+   #file( GLOB_RECURSE DEMO_SOURCES RELATIVE ../nana-demo *.cpp )
+
+   #foreach( demofile ${DEMO_SOURCES} )
+   #    string( REPLACE ".cpp" "" demoname ${demofile} )
+   #    add_executable( ${demoname} ${demofile} )
+   #    set_property( TARGET ${demoname} PROPERTY CXX_STANDARD 14 )
+   #    target_link_libraries(${demoname} ${PROJECT_NAME})
+   #endforeach( demofile ${DEMO_SOURCES} )
+endif(BUILD_NANA_DEMOS)
+

From 0c59065d9edf227ad2f55de124cee058ec4e580f Mon Sep 17 00:00:00 2001
From: qPCR4vir <arielvina@yahoo.es>
Date: Mon, 14 Dec 2015 01:55:46 +0100
Subject: [PATCH 03/13] Document config.hpp

---
 include/nana/config.hpp | 81 +++++++++++++++++++++++++++++------------
 1 file changed, 57 insertions(+), 24 deletions(-)

diff --git a/include/nana/config.hpp b/include/nana/config.hpp
index b580adb0..b13c0886 100644
--- a/include/nana/config.hpp
+++ b/include/nana/config.hpp
@@ -7,7 +7,38 @@
  *	(See accompanying file LICENSE_1_0.txt or copy at
  *	http://www.boost.org/LICENSE_1_0.txt)
  *
- *	@file: nana/config.hpp
+ *	@file  nana/config.hpp
+ *
+ *	@brief Provide switches to adapt to the target OS, use of external libraries or workarounds compiler errors or lack of std C++ support.
+ *
+ *	To control target OS/compiler:
+ *	- NANA_WINDOWS
+ *	- NANA_MINGW
+ *	- NANA_POSIX
+ *	- NANA_LINUX
+ *	- NANA_MACOS
+ *	- NANA_X11
+ *	- NANA_UNICODE
+ *
+ *	External libraries:
+ *	- NANA_LIBPNG, USE_LIBPNG_FROM_OS
+ *	- NANA_LIBJPEG, USE_LIBJPEG_FROM_OS
+ *
+ * (see: Feature-testing recommendations for C++
+ *       in http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0096r0.html
+ *       for example: __cpp_lib_experimental_filesystem  = 201406 in <experimental/filesystem)
+ *
+ *	Workaround to known compiler errors, unnecessary warnings or lack of C++11/14/17 support:
+ *	- _SCL_SECURE_NO_WARNNGS, _CRT_SECURE_NO_DEPRECATE (VC)
+ *	- STD_CODECVT_NOT_SUPPORTED (VC RC, <codecvt> is a known issue on libstdc++, it works on libc++)
+ *	- STD_THREAD_NOT_SUPPORTED (GCC < 4.8.1)
+ *	- STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED  (MinGW with GCC < 4.8.1)
+ *	- USE_github_com_meganz_mingw_std_threads  (MinGW with GCC < 4.8.1)
+ *	- STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED (MinGW with GCC < 4.8.1)
+ *	- STD_TO_STRING_NOT_SUPPORTED (MinGW with GCC < 4.8)
+ *	- STD_make_unique_NOT_SUPPORTED  (MinGW with GCC < 4.8.1)
+ *	  or __cpp_lib_make_unique
+ *	http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0096r0.html#detail.cpp14.n3656
  */
 
 #ifndef NANA_CONFIG_HPP
@@ -18,31 +49,31 @@
 	 // Windows:
 	#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
 
-		#define NANA_WINDOWS
+			#define NANA_WINDOWS
 
-		// MINGW ...
-		#if defined(__MINGW32__) || defined(__MINGW64__) || defined(MINGW)
-			#define NANA_MINGW
-		#endif // MINGW
-
-	// end Windows
+			// MINGW ...
+			#if defined(__MINGW32__) || defined(__MINGW64__) || defined(MINGW)
+				#define NANA_MINGW
+			#endif // MINGW
+		// end Windows
 
 
-	 // MacOS:     who define APPLE ??
-      //#define APPLE
-    #elif defined(APPLE)
-		#define NANA_MACOS
-		#define NANA_X11
+		 // MacOS:     who define APPLE ??
+		  //#define APPLE
+		#elif defined(APPLE)
+			#define NANA_MACOS
+			#define NANA_X11
 		// how to add this:  include_directories(/opt/X11/include/)
-	// end MacOS
+		// end MacOS
 
-	 // Linux:    (not sure about __GNU__ ??)
-	#elif (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) && !defined(_CRAYC)
-		#define NANA_LINUX
-		#define NANA_X11
-	// end Linux
-	#else
-	#	static_assert(false, "Only Windows and Unix are supported now (Mac OS is experimental)");
+		 // Linux:    (not sure about __GNU__ ??)
+		#elif (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) && !defined(_CRAYC)
+			#define NANA_LINUX
+			#define NANA_X11
+		// end Linux
+
+		#else
+		#error( "Only Windows and Unix are supported now (Mac OS is experimental)");
 	#endif // Select platform
 
 	#if defined(NANA_LINUX) || defined(NANA_MACOS)
@@ -76,7 +107,7 @@
 	#endif
 
 #elif defined(__GNUC__) //GCC
-	#if defined(__GLIBCPP__) || defined(__GLIBCXX__)
+	#if defined(__GLIBCPP__) || defined( __GLIBCXX__ )
 		//<codecvt> is a known issue on libstdc++, it works on libc++
 		#define STD_CODECVT_NOT_SUPPORTED
 	#endif
@@ -89,7 +120,9 @@
 			//but if USE_github_com_meganz_mingw_std_threads is enabled,
 			//boost.thread will be replaced with meganz's mingw-std-threads.
 			// https://github.com/meganz/mingw-std-threads
-			//#define USE_github_com_meganz_mingw_std_threads
+        	#if !defined( USE_github_com_meganz_mingw_std_threads )
+			    //#define USE_github_com_meganz_mingw_std_threads
+            #endif
 			#if !defined(STD_make_unique_NOT_SUPPORTED)
 				#define STD_make_unique_NOT_SUPPORTED
 			#endif	//STD_make_unique_NOT_SUPPORTED
@@ -156,4 +189,4 @@
 #endif
 
 
-#endif	//NANA_CONFIG_HPP
+#endif  // NANA_CONFIG_HPP
\ No newline at end of file

From cfc73be627f41574b0bb6723e767553aadf6f40d Mon Sep 17 00:00:00 2001
From: qPCR4vir <arielvina@yahoo.es>
Date: Mon, 14 Dec 2015 02:09:26 +0100
Subject: [PATCH 04/13] VERBOSE_PREPROCESSOR "Show annoying debug messages
 during compilation."

---
 .gitignore                            |  1 +
 CMakeLists.txt                        |  5 +++
 include/nana/config.hpp               |  9 +++++
 include/nana/deploy.hpp               |  7 +++-
 include/nana/verbose_preprocessor.hpp | 56 +++++++++++++++++++++++++++
 5 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 include/nana/verbose_preprocessor.hpp

diff --git a/.gitignore b/.gitignore
index 53eee01b..71a1545a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ lib/
 *.ninja*
 CMakeCache.txt
 CMakeFiles/
+.idea/
 cmake_install.cmake
 *.DS_Store
 .idea/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15bcb6c9..6dcf635d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,8 @@
 #	Robert Hauck - Enable support for PNG/Freetype
 #   Qiangqiang Wu - Add biicode support
 
+option(CMAKE_VERBOSE_PREPROCESSOR "Show annoying debug messages during compilation." OFF)
+option(CMAKE_STOP_VERBOSE_PREPROCESSOR "Stop compilation after showing the annoying debug messages." ON)
 option(BUILD_NANA_DEMOS "Build all the demos form the nana_demo repository." ON)
 option(CMAKE_STD_make_unique_NOT_SUPPORTED "Add support for make_unique<>().")
 #set(CMAKE_STD_make_unique_NOT_SUPPORTED OFF)
@@ -99,6 +101,9 @@ if(ENABLE_JPEG)
 endif()
 
 
+if(CMAKE_VERBOSE_PREPROCESSOR)
+    add_definitions(-DVERBOSE_PREPROCESSOR)
+endif(CMAKE_VERBOSE_PREPROCESSOR)
 
 # STD_make_unique_NOT_SUPPORTED
 if(CMAKE_STD_make_unique_NOT_SUPPORTED)
diff --git a/include/nana/config.hpp b/include/nana/config.hpp
index b13c0886..cbac37f0 100644
--- a/include/nana/config.hpp
+++ b/include/nana/config.hpp
@@ -36,6 +36,7 @@
  *	- USE_github_com_meganz_mingw_std_threads  (MinGW with GCC < 4.8.1)
  *	- STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED (MinGW with GCC < 4.8.1)
  *	- STD_TO_STRING_NOT_SUPPORTED (MinGW with GCC < 4.8)
+ *	- VERBOSE_PREPROCESSOR, STOP_VERBOSE_PREPROCESSOR
  *	- STD_make_unique_NOT_SUPPORTED  (MinGW with GCC < 4.8.1)
  *	  or __cpp_lib_make_unique
  *	http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0096r0.html#detail.cpp14.n3656
@@ -188,5 +189,13 @@
 	#endif
 #endif
 
+#if !defined(VERBOSE_PREPROCESSOR)
+    //#define VERBOSE_PREPROCESSOR
+#endif
+
+#if !defined(STOP_VERBOSE_PREPROCESSOR)
+	#define STOP_VERBOSE_PREPROCESSOR
+#endif
+
 
 #endif  // NANA_CONFIG_HPP
\ No newline at end of file
diff --git a/include/nana/deploy.hpp b/include/nana/deploy.hpp
index f10dbebc..2b8f7e13 100644
--- a/include/nana/deploy.hpp
+++ b/include/nana/deploy.hpp
@@ -15,9 +15,12 @@
 #ifndef NANA_DEPLOY_HPP
 #define NANA_DEPLOY_HPP
 
-#include <stdexcept>
-
 #include <nana/config.hpp>
+#if defined(VERBOSE_PREPROCESSOR)
+	#include <nana/verbose_preprocessor.hpp>
+#endif
+
+#include <stdexcept>
 #include <nana/charset.hpp>
 
 
diff --git a/include/nana/verbose_preprocessor.hpp b/include/nana/verbose_preprocessor.hpp
new file mode 100644
index 00000000..b62267f6
--- /dev/null
+++ b/include/nana/verbose_preprocessor.hpp
@@ -0,0 +1,56 @@
+/**
+ *	Nana Verbose preprocessor
+ *	Nana C++ Library(http://www.nanapro.org)
+ *	Copyright(C) 2003-2016 Jinhao(cnjinhao@hotmail.com)
+ *
+ *	Distributed under the Boost Software License, Version 1.0.
+ *	(See accompanying file LICENSE_1_0.txt or copy at
+ *	http://www.boost.org/LICENSE_1_0.txt)
+ *
+ *	@file     nana/verbose_preprocessor.hpp
+ *
+ *	@brief    show the values of configuration constants during compilation to facilitate build debugging.
+ *
+ *	Set VERBOSE_PREPROCESSOR to 1 to show the messages or to 0 for a normal build.
+ *	Normally set to 0. Set to 1 only in case you want to debug the build system because it is extremely repetitive and slow.
+ *
+ *  @authors  Ariel Vina-Rodriguez (qPCR4vir)
+ *
+ */
+// Created by ariel.rodriguez on 08.12.2015.
+//
+
+#ifndef NANA_VERBOSE_PREPROCESSOR_H
+#define NANA_VERBOSE_PREPROCESSOR_H
+
+#if defined(VERBOSE_PREPROCESSOR)
+
+    #define STRING2(x) #x
+	#define STRING(x) STRING2(x)
+	#pragma message ( "\nVerbose preprocessor =" STRING(VERBOSE_PREPROCESSOR)" , \n STOP_VERBOSE_PREPROCESSOR=" STRING(STOP_VERBOSE_PREPROCESSOR)  )
+
+	#pragma message ( "\nWindows: \n _WIN32=" STRING(_WIN32) ", \n __WIN32__ =" STRING(__WIN32__) " , \n WIN32=" STRING(WIN32)" , \n NANA_WINDOWS=" STRING(NANA_WINDOWS)   )
+
+	#pragma message ( "\nUNICODE: \n NANA_UNICODE=" STRING(NANA_UNICODE) ", \n _UNICODE =" STRING(_UNICODE) " , \n UNICODE=" STRING(UNICODE)  )
+
+	#pragma message ( "\nMinGW: \n __MINGW32__=" STRING(__MINGW32__) ", \n __MINGW64__=" STRING(__MINGW64__) " , \n MINGW=" STRING(MINGW) )
+
+	#pragma message ( "\nGNU: \n __GNUC__=" STRING(__GNUC__) ", \n __GNUC_MINOR__=" STRING(__GNUC_MINOR__) " , \n __GNUC_PATCHLEVEL__=" STRING(__GNUC_PATCHLEVEL__) )
+
+    #pragma message ( "\nSTD: \nSTD_CODECVT_NOT_SUPPORTED=" STRING(STD_CODECVT_NOT_SUPPORTED) " , \nSTD_THREAD_NOT_SUPPORTED=" STRING(STD_THREAD_NOT_SUPPORTED) )
+
+	#pragma message ( "\nSTD: \nUSE_github_com_meganz_mingw_std_threads=" STRING(USE_github_com_meganz_mingw_std_threads) " , \nSTD_THREAD_NOT_SUPPORTED=" STRING(STD_THREAD_NOT_SUPPORTED) )
+
+	#pragma message ( "\nClang compiler: \n__clang__=" STRING(__clang__)  ", \n__GLIBCPP__=" STRING(__GLIBCPP__) " , \n__GLIBCXX__=" STRING(__GLIBCXX__) )
+
+	#pragma message ( "\nMSC: \n_MSC_VER=" STRING(_MSC_VER) ", \n_MSC_FULL_VER=" STRING(_MSC_FULL_VER ) )
+
+    #if defined(STOP_VERBOSE_PREPROCESSOR)
+        #error ("\nCompilation stopped to avoid annoying messages")
+    #endif
+
+#endif // VERBOSE_PREPROCESSOR
+
+
+
+#endif //NANA_VERBOSE_PREPROCESSOR_H

From 986f5ea9ad84899b1cb965d63da6f176b3c4af99 Mon Sep 17 00:00:00 2001
From: qPCR4vir <arielvina@yahoo.es>
Date: Mon, 14 Dec 2015 02:33:11 +0100
Subject: [PATCH 05/13] Reorganize options in CMakeList.txt at the beginning
 with right defaults. Add condition in endif()

---
 CMakeLists.txt | 81 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 49 insertions(+), 32 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6dcf635d..2ffdc012 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,16 @@
 #	Robert Hauck - Enable support for PNG/Freetype
 #   Qiangqiang Wu - Add biicode support
 
+
+#https://cmake.org/cmake-tutorial/
+#https://cmake.org/cmake/help/v3.3/module/CMakeDependentOption.html?highlight=cmakedependentoption
+# use CACHE FORCE?  or set(USE_meganz_mingw_std_threads ON) or delete CMakecache.txt or the entery build dir
+option(USE_meganz_mingw_std_threads "replaced boost.thread with meganz's mingw-std-threads." OFF)
+option(USE_UNICODE "Use Unicode Character Set" ON)
+option(ENABLE_PNG "Enable the use of PNG" OFF)
+option(LIBPNG_FROM_OS "Use libpng from operating system." ON)
+option(ENABLE_JPEG "Enable the use of JPEG" OFF)
+option(LIBJPEG_FROM_OS "Use libjpeg from operating system." ON)
 option(CMAKE_VERBOSE_PREPROCESSOR "Show annoying debug messages during compilation." OFF)
 option(CMAKE_STOP_VERBOSE_PREPROCESSOR "Stop compilation after showing the annoying debug messages." ON)
 option(BUILD_NANA_DEMOS "Build all the demos form the nana_demo repository." ON)
@@ -24,37 +34,47 @@ if(BIICODE)
     add_biicode_targets()
     
     return()
-endif()
+endif(BIICODE)
 
 project(nana)
 cmake_minimum_required(VERSION 2.8)
 
 
-#Global MSVC definitions
 if(WIN32)
-	if(MSVC)
+    add_definitions(-DWIN32)
+
+    #Global MSVC definitions
+    if(MSVC)
 		option(WIN32_USE_MP "Set to ON to build nana with the /MP option (Visual Studio 2005 and above)." ON)
 		# ??
 		if(WIN32_USE_MP)
 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-		endif()
-		
+		endif(WIN32_USE_MP)
 	endif(MSVC)
+
+    if(MINGW)
+        add_definitions(-DMINGW)
+        #Find PNG
+        if(USE_meganz_mingw_std_threads)
+            add_definitions(-DUSE_github_com_meganz_mingw_std_threads)
+            # remove_definitions()
+        endif(USE_meganz_mingw_std_threads)
+    endif(MINGW)
+
 endif(WIN32)
 
 
 #Unicode
-option(USE_UNICODE "Use Unicode Character Set")
 if(USE_UNICODE)
     add_definitions(-DNANA_UNICODE)
-endif()
+endif(USE_UNICODE)
 
 if(APPLE)
     add_definitions(-DAPPLE)
     include_directories(/opt/X11/include/)
 elseif(UNIX)
     add_definitions(-Dlinux)
-endif()
+endif(APPLE)
 
 
 
@@ -62,19 +82,10 @@ if(UNIX)
     find_package(Freetype)
     if (FREETYPE_FOUND)
         include_directories( ${FREETYPE_INCLUDE_DIRS})
-    endif()
-endif()
-
-if(WIN32)
-    add_definitions(-DWIN32)
-    if(MINGW)
-        add_definitions(-DMINGW)
-    endif()
-endif()
+    endif(FREETYPE_FOUND)
+endif(UNIX)
 
 #Find PNG
-option(ENABLE_PNG "Enable the use of PNG")
-option(LIBPNG_FROM_OS "Use libpng from operating system.")
 if(ENABLE_PNG)
     add_definitions(-DNANA_ENABLE_PNG)
     if(LIBPNG_FROM_OS)
@@ -82,13 +93,11 @@ if(ENABLE_PNG)
         if (PNG_FOUND)
             include_directories( ${PNG_INCLUDE_DIRS})
             add_definitions(-DUSE_LIBPNG_FROM_OS)
-        endif()
-    endif()
-endif()
+        endif(PNG_FOUND)
+    endif(LIBPNG_FROM_OS)
+endif(ENABLE_PNG)
 
 #Find JPEG
-option(ENABLE_JPEG "Enable the use of JPEG")
-option(LIBJPEG_FROM_OS "Use libjpeg from operating system.")
 if(ENABLE_JPEG)
     add_definitions(-DNANA_ENABLE_JPEG)
     if(LIBJPEG_FROM_OS)
@@ -96,11 +105,13 @@ if(ENABLE_JPEG)
         if (JPEG_FOUND)
             include_directories( ${JPEG_INCLUDE_DIRS})
             add_definitions(-DUSE_LIBJPEG_FROM_OS)
-        endif()
-    endif()
-endif()
+        endif(JPEG_FOUND)
+    endif(LIBJPEG_FROM_OS)
+endif(ENABLE_JPEG)
 
 
+
+#Unicode
 if(CMAKE_VERBOSE_PREPROCESSOR)
     add_definitions(-DVERBOSE_PREPROCESSOR)
 endif(CMAKE_VERBOSE_PREPROCESSOR)
@@ -131,13 +142,16 @@ aux_source_directory(${NANA_SOURCE_DIR}/paint/detail NANA_PAINT_DETAIL_SOURCE)
 aux_source_directory(${NANA_SOURCE_DIR}/system NANA_SYSTEM_SOURCE)
 aux_source_directory(${NANA_SOURCE_DIR}/threads NANA_THREADS_SOURCE)
 
+#To show .h files in Visual Studio, add them to the list of sources in add_executable / add_library
+#and Use SOURCE_GROUP if all your sources are in the same directory
+
 add_library(${PROJECT_NAME} ${NANA_SOURCE}
                             ${NANA_DETAIL_SOURCE}
                             ${NANA_FILESYSTEM_SOURCE}
-#if(NOT APPLE)
+if(NOT APPLE)
                             ${NANA_AUDIO_SOURCE}
                             ${NANA_AUDIO_DETAIL_SOURCE}
-#endif
+endif (NOT APPLE)
                             ${NANA_GUI_SOURCE}
                             ${NANA_GUI_DETAIL_SOURCE}
                             ${NANA_GUI_WIDGETS_SOURCE}
@@ -147,9 +161,12 @@ add_library(${PROJECT_NAME} ${NANA_SOURCE}
                             ${NANA_SYSTEM_SOURCE}
                             ${NANA_THREADS_SOURCE})       
 
-#if(APPLE)
-target_link_libraries(${PROJECT_NAME} -L/opt/X11/lib/ -lX11 -lXft -lpng -liconv)
-#endif()
+if(APPLE)
+    #Headers: use INCLUDE_DIRECTORIES
+    #   Libraries: use FIND_LIBRARY and link with the result of it (try to avoid LINK_DIRECTORIES
+    target_link_libraries(${PROJECT_NAME} -L/opt/X11/lib/ -lX11 -lXft -lpng -liconv)
+
+endif(APPLE)
                  
 install(TARGETS ${PROJECT_NAME}
             ARCHIVE DESTINATION lib

From 0bd5483cdd7d77ea3bd2d791466eeebfff014d24 Mon Sep 17 00:00:00 2001
From: qPCR4vir <arielvina@yahoo.es>
Date: Mon, 14 Dec 2015 12:44:37 +0100
Subject: [PATCH 06/13] reorganize

---
 CMakeLists.txt          |  9 +++++----
 include/nana/config.hpp | 25 +++++++++++--------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ffdc012..e416d60c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,11 +3,12 @@
 # Contributor:
 #	Robert Hauck - Enable support for PNG/Freetype
 #   Qiangqiang Wu - Add biicode support
-
+#   Ariel Vina-Rodriguez (qPCR4vir) 
 
 #https://cmake.org/cmake-tutorial/
 #https://cmake.org/cmake/help/v3.3/module/CMakeDependentOption.html?highlight=cmakedependentoption
-# use CACHE FORCE?  or set(USE_meganz_mingw_std_threads ON) or delete CMakecache.txt or the entery build dir
+# use CACHE FORCE  or set(USE_meganz_mingw_std_threads ON) or delete CMakecache.txt or the entirely build dir
+# if your changes don't execute
 option(USE_meganz_mingw_std_threads "replaced boost.thread with meganz's mingw-std-threads." OFF)
 option(USE_UNICODE "Use Unicode Character Set" ON)
 option(ENABLE_PNG "Enable the use of PNG" OFF)
@@ -16,8 +17,8 @@ option(ENABLE_JPEG "Enable the use of JPEG" OFF)
 option(LIBJPEG_FROM_OS "Use libjpeg from operating system." ON)
 option(CMAKE_VERBOSE_PREPROCESSOR "Show annoying debug messages during compilation." OFF)
 option(CMAKE_STOP_VERBOSE_PREPROCESSOR "Stop compilation after showing the annoying debug messages." ON)
-option(BUILD_NANA_DEMOS "Build all the demos form the nana_demo repository." ON)
-option(CMAKE_STD_make_unique_NOT_SUPPORTED "Add support for make_unique<>().")
+option(BUILD_NANA_DEMOS "Build all the demos form the nana_demo repository." OFF)
+option(CMAKE_STD_make_unique_NOT_SUPPORTED "Add support for make_unique<>()." OFF)
 #set(CMAKE_STD_make_unique_NOT_SUPPORTED OFF)
 
 # set compile  flags
diff --git a/include/nana/config.hpp b/include/nana/config.hpp
index cbac37f0..52ec94c6 100644
--- a/include/nana/config.hpp
+++ b/include/nana/config.hpp
@@ -52,10 +52,6 @@
 
 			#define NANA_WINDOWS
 
-			// MINGW ...
-			#if defined(__MINGW32__) || defined(__MINGW64__) || defined(MINGW)
-				#define NANA_MINGW
-			#endif // MINGW
 		// end Windows
 
 
@@ -101,18 +97,15 @@
 	#endif // _MSC_VER == 1900
 #endif // _MSVC
 
-#if defined(__clang__)
-	#if defined(__GLIBCPP__) || defined(__GLIBCXX__)
-		//<codecvt> is a known issue on libstdc++, it works on libc++
-		#define STD_CODECVT_NOT_SUPPORTED
-	#endif
-
+#if   defined(__clang__)
 #elif defined(__GNUC__) //GCC
-	#if defined(__GLIBCPP__) || defined( __GLIBCXX__ )
-		//<codecvt> is a known issue on libstdc++, it works on libc++
-		#define STD_CODECVT_NOT_SUPPORTED
-	#endif
 
+	// MINGW ...
+	#if defined(__MINGW32__) || defined(__MINGW64__) || defined(MINGW)
+		#define NANA_MINGW
+	#endif // MINGW
+
+	// support for GCC 4.8.1 will be discontinued. Please use v5 or newer.
 	#if (__GNUC__ == 4)
 		#if ((__GNUC_MINOR__ < 8) || (__GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ <= 1))
 			#define STD_THREAD_NOT_SUPPORTED
@@ -141,6 +134,10 @@
 	#endif
 #endif
 
+//<codecvt> is a known issue on libstdc++, it works on libc++
+#if defined(__GLIBCPP__) || defined( __GLIBCXX__ )
+	#define STD_CODECVT_NOT_SUPPORTED
+#endif // __GLIBCPP__ or __GLIBCXX__
 
 
 // End compilers ...

From 1d9b75b1c21de16454063ad86da9e906980f9b49 Mon Sep 17 00:00:00 2001
From: Jinhao <cnjinhao@hotmail.com>
Date: Tue, 15 Dec 2015 15:51:29 +0800
Subject: [PATCH 07/13] fix std numeric conversions errors for GCC 5.1

---
 include/nana/config.hpp | 18 +++++++++++++++---
 include/nana/deploy.hpp | 13 +++++++++----
 source/deploy.cpp       |  7 +++++++
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/include/nana/config.hpp b/include/nana/config.hpp
index e97c70f6..0fead174 100644
--- a/include/nana/config.hpp
+++ b/include/nana/config.hpp
@@ -81,24 +81,36 @@
 		#define STD_CODECVT_NOT_SUPPORTED
 	#endif
 
+
 	#if (__GNUC__ == 4)
 		#if ((__GNUC_MINOR__ < 8) || (__GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ < 1))
 			#define STD_THREAD_NOT_SUPPORTED
-
+			
 			//boost.thread is preferred
 			//but if USE_github_com_meganz_mingw_std_threads is enabled,
 			//boost.thread will be replaced with meganz's mingw-std-threads.
 			// https://github.com/meganz/mingw-std-threads
 			//#define USE_github_com_meganz_mingw_std_threads
+			
+			#define STD_TO_STRING_NOT_SUPPORTED
 		#endif
-
+		
+		//_GLIBCXX_HAVE_BROKEN_VSWPRINTF is enabled to turn off all numeric conversions on MinGW(GCC 4)
+		
 		#if defined(NANA_MINGW)
-			//It's a known issue under MinGW
+			//It's a knonwn issue under MinGW
 			#define STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED
 		#endif
 
 		#if ((__GNUC_MINOR__ < 8) || defined(NANA_MINGW))
 			#define STD_TO_STRING_NOT_SUPPORTED
+			#define STD_TO_WSTRING_NOT_SUPPORTED
+		#endif
+	#elif (__GNUC__ == 5)
+		#if defined(NANA_MINGW)
+			//The _GLIBCXX_HAVE_BROKEN_VSWPRINTF only applies to wide string
+			//It's a knonwn issue under MinGW
+			#define STD_TO_WSTRING_NOT_SUPPORTED	
 		#endif
 	#endif
 #endif
diff --git a/include/nana/deploy.hpp b/include/nana/deploy.hpp
index 30d87935..802e6335 100644
--- a/include/nana/deploy.hpp
+++ b/include/nana/deploy.hpp
@@ -1,10 +1,10 @@
 /*
  *	The Deploy Implementation
  *	Nana C++ Library(http://www.nanapro.org)
- *	Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com)
+ *	Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
  *
- *	Distributed under the Boost Software License, Version 1.0. 
- *	(See accompanying file LICENSE_1_0.txt or copy at 
+ *	Distributed under the Boost Software License, Version 1.0.
+ *	(See accompanying file LICENSE_1_0.txt or copy at
  *	http://www.boost.org/LICENSE_1_0.txt)
  *
  *	@file: nana/deploy.hpp
@@ -72,7 +72,12 @@ namespace std
 	std::string to_string(long long);
 	std::string to_string(unsigned long long);
 	std::string to_string(float);
-	
+}
+#endif
+
+#ifdef STD_TO_WSTRING_NOT_SUPPORTED
+namespace std
+{
 	std::wstring to_wstring(long double);
 	std::wstring to_wstring(double);
 	std::wstring to_wstring(unsigned);
diff --git a/source/deploy.cpp b/source/deploy.cpp
index ce92982a..0f751352 100644
--- a/source/deploy.cpp
+++ b/source/deploy.cpp
@@ -298,6 +298,7 @@ namespace std
 #endif //STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED
 
 #ifdef STD_TO_STRING_NOT_SUPPORTED
+#include <sstream>
 namespace std
 {
 	std::string to_string(double v)
@@ -362,7 +363,13 @@ namespace std
 		ss << v;
 		return ss.str();
 	}
+}
+#endif // STD_TO_STRING_NOT_SUPPORTED
 
+#ifdef STD_TO_WSTRING_NOT_SUPPORTED
+#include <sstream>
+namespace std
+{
 	std::wstring to_wstring(double v)
 	{
 		std::wstringstream ss;

From 54ca38d575bb0f7d52b140cd2e083f0692589401 Mon Sep 17 00:00:00 2001
From: Jinhao <cnjinhao@hotmail.com>
Date: Thu, 17 Dec 2015 00:07:44 +0800
Subject: [PATCH 08/13] improve support of MinGW-w64

---
 include/nana/config.hpp | 44 ++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/include/nana/config.hpp b/include/nana/config.hpp
index 0fead174..975e44c0 100644
--- a/include/nana/config.hpp
+++ b/include/nana/config.hpp
@@ -67,50 +67,58 @@
 		// google: That's a known issue, tracked by an active bug (DevDiv#1060849). We were able to update the STL's headers in response to char16_t/char32_t, but we still need to update the separately compiled sources.
 		#define STD_CODECVT_NOT_SUPPORTED
 	#endif // _MSC_VER == 1900
-#endif // _MSVC
 
-#if defined(__clang__)
+#elif defined(__clang__)	//Clang
+
+	#include <iosfwd>	//Introduces some implement-specific flags of ISO C++ Library
 	#if defined(__GLIBCPP__) || defined(__GLIBCXX__)
 		//<codecvt> is a known issue on libstdc++, it works on libc++
 		#define STD_CODECVT_NOT_SUPPORTED
 	#endif
 
 #elif defined(__GNUC__) //GCC
+
+	#include <iosfwd>	//Introduces some implement-specific flags of ISO C++ Library
 	#if defined(__GLIBCPP__) || defined(__GLIBCXX__)
 		//<codecvt> is a known issue on libstdc++, it works on libc++
 		#define STD_CODECVT_NOT_SUPPORTED
-	#endif
 
+		//It's a known issue of libstdc++ on MinGW
+		//introduce to_string/to_wstring workarounds for disabled capacity of stdlib
+		#ifdef _GLIBCXX_HAVE_BROKEN_VSWPRINTF
+			#if (__GNUC__ < 5)
+			#	define STD_TO_STRING_NOT_SUPPORTED
+			#endif
+
+			#define STD_TO_WSTRING_NOT_SUPPORTED
+		#endif
+	#endif
 
 	#if (__GNUC__ == 4)
 		#if ((__GNUC_MINOR__ < 8) || (__GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ < 1))
 			#define STD_THREAD_NOT_SUPPORTED
-			
+
 			//boost.thread is preferred
 			//but if USE_github_com_meganz_mingw_std_threads is enabled,
 			//boost.thread will be replaced with meganz's mingw-std-threads.
 			// https://github.com/meganz/mingw-std-threads
 			//#define USE_github_com_meganz_mingw_std_threads
-			
-			#define STD_TO_STRING_NOT_SUPPORTED
 		#endif
-		
-		//_GLIBCXX_HAVE_BROKEN_VSWPRINTF is enabled to turn off all numeric conversions on MinGW(GCC 4)
-		
+
 		#if defined(NANA_MINGW)
 			//It's a knonwn issue under MinGW
 			#define STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED
 		#endif
 
-		#if ((__GNUC_MINOR__ < 8) || defined(NANA_MINGW))
-			#define STD_TO_STRING_NOT_SUPPORTED
-			#define STD_TO_WSTRING_NOT_SUPPORTED
-		#endif
-	#elif (__GNUC__ == 5)
-		#if defined(NANA_MINGW)
-			//The _GLIBCXX_HAVE_BROKEN_VSWPRINTF only applies to wide string
-			//It's a knonwn issue under MinGW
-			#define STD_TO_WSTRING_NOT_SUPPORTED	
+		#if (__GNUC_MINOR__ < 8)
+			//introduce to_string/to_wstring workaround for lack of stdlib definitions
+			#ifndef STD_TO_STRING_NOT_SUPPORTED
+			#	define STD_TO_STRING_NOT_SUPPORTED
+			#endif
+
+			#ifndef STD_TO_WSTRING_NOT_SUPPORTED
+			#	define STD_TO_WSTRING_NOT_SUPPORTED
+			#endif
 		#endif
 	#endif
 #endif

From 25743b14a97cc66fec963f92ce889af3198b44e0 Mon Sep 17 00:00:00 2001
From: Jinhao <cnjinhao@hotmail.com>
Date: Fri, 18 Dec 2015 00:57:46 +0800
Subject: [PATCH 09/13] add native_interface::set_parent

---
 include/nana/gui/detail/native_window_interface.hpp |  1 +
 source/gui/detail/native_window_interface.cpp       | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/include/nana/gui/detail/native_window_interface.hpp b/include/nana/gui/detail/native_window_interface.hpp
index 5db4a645..fa935799 100644
--- a/include/nana/gui/detail/native_window_interface.hpp
+++ b/include/nana/gui/detail/native_window_interface.hpp
@@ -70,6 +70,7 @@ namespace detail
 		static void	capture_window(native_window_type, bool);
 		static nana::point	cursor_position();
 		static native_window_type get_owner_window(native_window_type);
+		static native_window_type set_parent(native_window_type child, native_window_type new_parent);
 		//For Caret
 		static void	caret_create(native_window_type, const ::nana::size&);
 		static void caret_destroy(native_window_type);
diff --git a/source/gui/detail/native_window_interface.cpp b/source/gui/detail/native_window_interface.cpp
index 202a76d3..7059e118 100644
--- a/source/gui/detail/native_window_interface.cpp
+++ b/source/gui/detail/native_window_interface.cpp
@@ -1199,6 +1199,17 @@ namespace nana{
 			return reinterpret_cast<native_window_type>(::GetWindow(reinterpret_cast<HWND>(wd), GW_OWNER));
 #elif defined(NANA_X11)
 			return restrict::spec.get_owner(wd);
+#endif
+		}
+
+		native_window_type native_interface::set_parent(native_window_type child, native_window_type new_parent)
+		{
+#ifdef NANA_WINDOWS
+			return reinterpret_cast<native_window_type>(
+					::SetParent(reinterpret_cast<HWND>(child), reinterpret_cast<HWND>(new_parent))
+				);
+#elif defined(NANA_X11)
+
 #endif
 		}
 

From 14468494541f2432530df7d90f107be9d7112e14 Mon Sep 17 00:00:00 2001
From: Jinhao <cnjinhao@hotmail.com>
Date: Fri, 18 Dec 2015 01:00:33 +0800
Subject: [PATCH 10/13] fix non-popup root window(nested_form) issues

---
 source/gui/detail/window_layout.cpp  | 10 ++++--
 source/gui/detail/window_manager.cpp | 53 ++++++++++++++++++++++++----
 source/gui/programming_interface.cpp |  4 +--
 3 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/source/gui/detail/window_layout.cpp b/source/gui/detail/window_layout.cpp
index 9f0e779e..f44be0a6 100644
--- a/source/gui/detail/window_layout.cpp
+++ b/source/gui/detail/window_layout.cpp
@@ -140,7 +140,7 @@ namespace nana
 							for (++i; i < end; ++i)
 							{
 								core_window_t* cover = *i;
-								if (cover->visible && (nullptr == cover->effect.bground))
+								if ((category::flags::root != cover->other.category) && cover->visible && (nullptr == cover->effect.bground))
 								{
 									if (overlap(vis_rect, rectangle{ cover->pos_root, cover->dimension }, block.r))
 									{
@@ -271,9 +271,15 @@ namespace nana
 				for (auto child : wd->children)
 				{
 					//it will not past children if no drawer and visible is false.
-					if ((false == child->visible) || ((child->other.category != category::lite_widget_tag::value) && child->drawer.graphics.empty()))
+					if ((false == child->visible) || ((category::flags::lite_widget != child->other.category) && child->drawer.graphics.empty()))
 						continue;
 
+					if (category::flags::root == child->other.category)
+					{
+						paint(child, is_child_refreshed, is_child_refreshed);
+						continue;
+					}
+
 					if (nullptr == child->effect.bground)
 					{
 						if (overlap(nana::rectangle{ child->pos_root, child->dimension }, parent_rect, rect))
diff --git a/source/gui/detail/window_manager.cpp b/source/gui/detail/window_manager.cpp
index 909cf193..e0d50056 100644
--- a/source/gui/detail/window_manager.cpp
+++ b/source/gui/detail/window_manager.cpp
@@ -291,6 +291,14 @@ namespace detail
 			if (result.native_handle)
 			{
 				core_window_t* wd = new core_window_t(owner, widget_notifier_interface::get_notifier(wdg), (category::root_tag**)nullptr);
+				if (nested)
+				{
+					wd->owner = nullptr;
+					wd->parent = owner;
+					wd->index = static_cast<unsigned>(owner->children.size());
+					owner->children.push_back(wd);
+				}
+
 				wd->flags.take_active = !app.no_activate;
 				wd->title = native_interface::window_caption(result.native_handle);
 
@@ -1301,7 +1309,9 @@ namespace detail
 		void window_manager::_m_disengage(core_window_t* wd, core_window_t* for_new)
 		{
 			auto * const wdpa = wd->parent;
-			bool established = (for_new && wdpa != for_new);
+
+
+			bool established = (for_new && (wdpa != for_new));
 			decltype(for_new->root_widget->other.attribute.root) pa_root_attr = nullptr;
 			
 			if (established)
@@ -1446,10 +1456,17 @@ namespace detail
 					wd->pos_root -= delta_pos;
 					for (auto child : wd->children)
 					{
-						child->root = wd->root;
-						child->root_graph = wd->root_graph;
-						child->root_widget = wd->root_widget;
-						set_pos_root(child, delta_pos);
+						if (category::flags::root == child->other.category)
+						{
+							native_interface::set_parent(child->root, wd->root);
+						}
+						else
+						{
+							child->root = wd->root;
+							child->root_graph = wd->root_graph;
+							child->root_widget = wd->root_widget;
+							set_pos_root(child, delta_pos);
+						}
 					}
 				};
 
@@ -1481,8 +1498,30 @@ namespace detail
 			brock.emit(event_code::destroy, wd, arg, true, brock.get_thread_context());
 
 			//Delete the children widgets.
-			for (auto i = wd->children.rbegin(), end = wd->children.rend(); i != end; ++i)
-				_m_destroy(*i);
+			for (auto i = wd->children.rbegin(), end = wd->children.rend(); i != end;)
+			{
+				auto child = *i;
+
+				if (category::flags::root == child->other.category)
+				{
+					//closing a child root window erases itself from wd->children,
+					//to make sure the iterator is valid, it must be reloaded.
+
+					auto offset = std::distance(wd->children.rbegin(), i);
+
+					//!!!
+					//a potential issue is that if the calling thread is not same with child's thread,
+					//the child root window may not be erased from wd->children now.
+					native_interface::close_window(child->root);
+
+					i = wd->children.rbegin();
+					std::advance(i, offset);
+					end = wd->children.rend();
+					continue;
+				}
+				_m_destroy(child);
+				++i;
+			}
 			wd->children.clear();
 
 
diff --git a/source/gui/programming_interface.cpp b/source/gui/programming_interface.cpp
index fdd4522c..2d731b77 100644
--- a/source/gui/programming_interface.cpp
+++ b/source/gui/programming_interface.cpp
@@ -542,8 +542,8 @@ namespace API
 	{
 		auto iwd = reinterpret_cast<basic_window*>(wd);
 		internal_scope_guard lock;
-		if(restrict::wd_manager().available(iwd))
-			return reinterpret_cast<window>(iwd->other.category == category::flags::root ? iwd->owner : iwd->parent);
+		if (restrict::wd_manager().available(iwd))
+			return reinterpret_cast<window>(iwd->parent);
 
 		return nullptr;
 	}

From 75800b2e78bee157f040b8120f522bd3cd46d2cc Mon Sep 17 00:00:00 2001
From: Jinhao <cnjinhao@hotmail.com>
Date: Sun, 20 Dec 2015 03:00:33 +0800
Subject: [PATCH 11/13] fix a crash when setting focus if prev is null

---
 source/gui/detail/window_manager.cpp | 45 +++++++++++++++-------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/source/gui/detail/window_manager.cpp b/source/gui/detail/window_manager.cpp
index e0d50056..207e2f19 100644
--- a/source/gui/detail/window_manager.cpp
+++ b/source/gui/detail/window_manager.cpp
@@ -927,34 +927,37 @@ namespace detail
 					arg.receiver = wd->root;
 					brock.emit(event_code::focus, prev_focus, arg, true, brock.get_thread_context());
 				}
+
+				//Check the prev_focus again, because it may be closed in focus event
+				if (!impl_->wd_register.available(prev_focus))
+					prev_focus = nullptr;
 			}
 			else if(wd->root == native_interface::get_focus_window())
-				wd = nullptr; //no new focus_window
+				return prev_focus; //no new focus_window
 
-			if(wd)
-			{
-				if(wd->together.caret)
-					wd->together.caret->set_active(true);
 
-				arg.window_handle = reinterpret_cast<window>(wd);
-				arg.getting = true;
-				arg.receiver = wd->root;
-				brock.emit(event_code::focus, wd, arg, true, brock.get_thread_context());
+			if(wd->together.caret)
+				wd->together.caret->set_active(true);
 
-				if (!root_has_been_focused)
-					native_interface::set_focus(root_wd->root);
+			arg.window_handle = reinterpret_cast<window>(wd);
+			arg.getting = true;
+			arg.receiver = wd->root;
+			brock.emit(event_code::focus, wd, arg, true, brock.get_thread_context());
 
-				//A fix by Katsuhisa Yuasa
-				//The menubar token window will be redirected to the prev focus window when the new
-				//focus window is a menubar.
-				//The focus window will be restore to the prev focus which losts the focus becuase of
-				//memberbar. 
-				if (wd == wd->root_widget->other.attribute.root->menubar)
-					wd = prev_focus;
+			if (!root_has_been_focused)
+				native_interface::set_focus(root_wd->root);
+
+			//A fix by Katsuhisa Yuasa
+			//The menubar token window will be redirected to the prev focus window when the new
+			//focus window is a menubar.
+			//The focus window will be restore to the prev focus which losts the focus becuase of
+			//memberbar. 
+			if (prev_focus && (wd == wd->root_widget->other.attribute.root->menubar))
+				wd = prev_focus;
+
+			if (wd != wd->root_widget->other.attribute.root->menubar)
+				brock.set_menubar_taken(wd);
 
-				if (wd != wd->root_widget->other.attribute.root->menubar)
-					brock.set_menubar_taken(wd);
-			}
 			return prev_focus;
 		}
 

From 9bb0e8eb3444f1e6162fe04188cc9d0fd45b7074 Mon Sep 17 00:00:00 2001
From: Jinhao <cnjinhao@hotmail.com>
Date: Tue, 22 Dec 2015 00:41:58 +0800
Subject: [PATCH 12/13] fix an issue of child root window(nested_form)

---
 .../gui/detail/native_window_interface.hpp    |  7 +-
 source/gui/detail/native_window_interface.cpp | 70 +++++++++++++++----
 source/gui/detail/window_manager.cpp          | 60 ++++++++++++----
 3 files changed, 109 insertions(+), 28 deletions(-)

diff --git a/include/nana/gui/detail/native_window_interface.hpp b/include/nana/gui/detail/native_window_interface.hpp
index fa935799..6a88c0a7 100644
--- a/include/nana/gui/detail/native_window_interface.hpp
+++ b/include/nana/gui/detail/native_window_interface.hpp
@@ -70,11 +70,12 @@ namespace detail
 		static void	capture_window(native_window_type, bool);
 		static nana::point	cursor_position();
 		static native_window_type get_owner_window(native_window_type);
-		static native_window_type set_parent(native_window_type child, native_window_type new_parent);
+		static native_window_type parent_window(native_window_type);
+		static native_window_type parent_window(native_window_type child, native_window_type new_parent, bool returns_previous);
 		//For Caret
-		static void	caret_create(native_window_type, const ::nana::size&);
+		static void caret_create(native_window_type, const ::nana::size&);
 		static void caret_destroy(native_window_type);
-		static void	caret_pos(native_window_type, const ::nana::point&);
+		static void caret_pos(native_window_type, const ::nana::point&);
 		static void caret_visible(native_window_type, bool);
 
 		static void	set_focus(native_window_type);
diff --git a/source/gui/detail/native_window_interface.cpp b/source/gui/detail/native_window_interface.cpp
index 7059e118..ed95415f 100644
--- a/source/gui/detail/native_window_interface.cpp
+++ b/source/gui/detail/native_window_interface.cpp
@@ -281,7 +281,8 @@ namespace nana{
 							attr_mask, &win_attr);
 			if(handle)
 			{
-				if(owner)
+				//make owner if it is a popup window
+				if((!nested) && owner)
 					restrict::spec.make_owner(owner, reinterpret_cast<native_window_type>(handle));
 
 				XTextProperty name;
@@ -417,8 +418,6 @@ namespace nana{
 
 			if(handle)
 			{
-				restrict::spec.make_owner(parent, reinterpret_cast<native_window_type>(handle));
-
 				XTextProperty name;
 				char text[] = "Nana Child Window";
 				char * str = text;
@@ -786,21 +785,30 @@ namespace nana{
 #if defined(NANA_WINDOWS)
 			::RECT r;
 			::GetWindowRect(reinterpret_cast<HWND>(wd), & r);
-			HWND owner = ::GetWindow(reinterpret_cast<HWND>(wd), GW_OWNER);
-			if(owner)
+			HWND coord_wd = ::GetWindow(reinterpret_cast<HWND>(wd), GW_OWNER);
+
+			if (!coord_wd)
+				coord_wd = ::GetParent(reinterpret_cast<HWND>(wd));
+
+			if (coord_wd)
 			{
 				::POINT pos = {r.left, r.top};
-				::ScreenToClient(owner, &pos);
+				::ScreenToClient(coord_wd, &pos);
 				return nana::point(pos.x, pos.y);
 			}
 			return nana::point(r.left, r.top);
 #elif defined(NANA_X11)
 			int x, y;
 			nana::detail::platform_scope_guard psg;
-			Window root = reinterpret_cast<Window>(restrict::spec.get_owner(wd));
-			if(root == 0) root = restrict::spec.root_window();
+			Window coord_wd = reinterpret_cast<Window>(restrict::spec.get_owner(wd));
+			if(!coord_wd)
+			{
+				coord_wd = reinterpret_cast<Window>(parent_window(wd));
+				if(!coord_wd)
+					coord_wd = restrict::spec.root_window();
+			}
 			Window child;
-			if(True == ::XTranslateCoordinates(restrict::spec.open_display(), reinterpret_cast<Window>(wd), root, 0, 0, &x, &y, &child))
+			if(True == ::XTranslateCoordinates(restrict::spec.open_display(), reinterpret_cast<Window>(wd), coord_wd, 0, 0, &x, &y, &child))
 				return nana::point(x, y);
 			return nana::point(0, 0);
 #endif
@@ -1202,14 +1210,50 @@ namespace nana{
 #endif
 		}
 
-		native_window_type native_interface::set_parent(native_window_type child, native_window_type new_parent)
+		native_window_type native_interface::parent_window(native_window_type wd)
 		{
 #ifdef NANA_WINDOWS
-			return reinterpret_cast<native_window_type>(
-					::SetParent(reinterpret_cast<HWND>(child), reinterpret_cast<HWND>(new_parent))
-				);
+			return reinterpret_cast<native_window_type>(::GetParent(reinterpret_cast<HWND>(wd)));
 #elif defined(NANA_X11)
+			Window root;
+			Window parent;
+			Window * children;
+			unsigned size;
+			
+			platform_scope_guard lock;
+			
+			if(0 != ::XQueryTree(restrict::spec.open_display(), reinterpret_cast<Window>(wd),
+				&root, &parent, &children, &size))
+			{
+				::XFree(children);
+				return reinterpret_cast<native_window_type>(parent);
+			}
+			return nullptr;
+#endif
+		}
 
+		native_window_type native_interface::parent_window(native_window_type child, native_window_type new_parent, bool returns_previous)
+		{
+#ifdef NANA_WINDOWS
+			auto prev = reinterpret_cast<native_window_type>(
+						::SetParent(reinterpret_cast<HWND>(child), reinterpret_cast<HWND>(new_parent))
+					);
+
+			::SetWindowPos(reinterpret_cast<HWND>(child), NULL, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_FRAMECHANGED);
+
+			return (returns_previous ? prev : nullptr);
+#elif defined(NANA_X11)
+			native_window_type prev = nullptr;
+
+			platform_scope_guard lock;
+
+			if(returns_previous)
+				prev = parent_window(child);
+
+			::XReparentWindow(restrict::spec.open_display(), 
+				reinterpret_cast<Window>(child), reinterpret_cast<Window>(new_parent),
+				0, 0);
+			return prev;
 #endif
 		}
 
diff --git a/source/gui/detail/window_manager.cpp b/source/gui/detail/window_manager.cpp
index 207e2f19..4aa19757 100644
--- a/source/gui/detail/window_manager.cpp
+++ b/source/gui/detail/window_manager.cpp
@@ -550,10 +550,10 @@ namespace detail
 			std::lock_guard<decltype(mutex_)> lock(mutex_);
 			if (impl_->wd_register.available(wd))
 			{
-				if(wd->other.category != category::root_tag::value)
+				if (category::flags::root != wd->other.category)
 				{
 					//Move child widgets
-					if(x != wd->pos_owner.x || y != wd->pos_owner.y)
+					if (x != wd->pos_owner.x || y != wd->pos_owner.y)
 					{
 						point delta{ x - wd->pos_owner.x, y - wd->pos_owner.y };
 
@@ -570,8 +570,20 @@ namespace detail
 						return true;
 					}
 				}
-				else if(false == passive)
+				else if (!passive)
+				{
+					//Check if this root is a nested
+					if (wd->parent && (category::flags::root != wd->parent->other.category))
+					{
+						//The parent of the window is not a root, the position should
+						//be transformed to a position based on its parent.
+
+						x += wd->parent->pos_root.x;
+						y += wd->parent->pos_root.y;
+					}
+
 					native_interface::move_window(wd->root, x, y);
+				}
 			}
 
 			return false;
@@ -610,22 +622,36 @@ namespace detail
 			}
 			else
 			{
+				::nana::rectangle root_r = r;
+				//Move event should not get called here,
+				//because the window is a root, the event will get called by system event handler.
+
+				//Check if this root is a nested
+				if (wd->parent && (category::flags::root != wd->parent->other.category))
+				{
+					//The parent of the window is not a root, the position should
+					//be transformed to a position based on its parent.
+
+					root_r.x += wd->parent->pos_root.x;
+					root_r.y += wd->parent->pos_root.y;
+				}
+
 				if(size_changed)
 				{
-					wd->dimension.width = r.width;
-					wd->dimension.height = r.height;
+					wd->dimension.width = root_r.width;
+					wd->dimension.height = root_r.height;
 					wd->drawer.graphics.make(wd->dimension);
 					wd->root_graph->make(wd->dimension);
-					native_interface::move_window(wd->root, r);
+					native_interface::move_window(wd->root, root_r);
 
 					arg_resized arg;
 					arg.window_handle = reinterpret_cast<window>(wd);
-					arg.width = r.width;
-					arg.height = r.height;
+					arg.width = root_r.width;
+					arg.height = root_r.height;
 					brock.emit(event_code::resized, wd, arg, true, brock.get_thread_context());
 				}
 				else
-					native_interface::move_window(wd->root, r.x, r.y);
+					native_interface::move_window(wd->root, root_r.x, root_r.y);
 			}
 
 			return (moved || size_changed);
@@ -1456,12 +1482,15 @@ namespace detail
 				std::function<void(core_window_t*, const nana::point&)> set_pos_root;
 				set_pos_root = [&set_pos_root](core_window_t* wd, const nana::point& delta_pos)
 				{
-					wd->pos_root -= delta_pos;
 					for (auto child : wd->children)
 					{
 						if (category::flags::root == child->other.category)
 						{
-							native_interface::set_parent(child->root, wd->root);
+							auto pos = native_interface::window_position(child->root);
+							native_interface::parent_window(child->root, wd->root, false);
+
+							pos -= delta_pos;
+							native_interface::move_window(child->root, pos.x, pos.y);
 						}
 						else
 						{
@@ -1471,6 +1500,8 @@ namespace detail
 							set_pos_root(child, delta_pos);
 						}
 					}
+
+					wd->pos_root -= delta_pos;
 				};
 
 				set_pos_root(wd, delta_pos);
@@ -1550,7 +1581,7 @@ namespace detail
 
 		void window_manager::_m_move_core(core_window_t* wd, const point& delta)
 		{
-			if(wd->other.category != category::root_tag::value)	//A root widget always starts at (0, 0) and its childs are not to be changed
+			if(category::flags::root != wd->other.category)	//A root widget always starts at (0, 0) and its childs are not to be changed
 			{
 				wd->pos_root += delta;
 				if (category::flags::frame != wd->other.category)
@@ -1567,6 +1598,11 @@ namespace detail
 				for (auto child : wd->children)
 					_m_move_core(child, delta);
 			}
+			else
+			{
+				auto pos = native_interface::window_position(wd->root) + delta;
+				native_interface::move_window(wd->root, pos.x, pos.y);
+			}
 		}
 
 		//_m_find

From 3856543dafcfb34b20411e165b8bba8911912ae3 Mon Sep 17 00:00:00 2001
From: Jinhao <cnjinhao@hotmail.com>
Date: Tue, 22 Dec 2015 23:47:56 +0800
Subject: [PATCH 13/13] fix wrong position of sub menu

---
 source/gui/detail/native_window_interface.cpp | 9 +++++----
 source/gui/widgets/menu.cpp                   | 7 +++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/gui/detail/native_window_interface.cpp b/source/gui/detail/native_window_interface.cpp
index ed95415f..786a5df2 100644
--- a/source/gui/detail/native_window_interface.cpp
+++ b/source/gui/detail/native_window_interface.cpp
@@ -1235,13 +1235,14 @@ namespace nana{
 		native_window_type native_interface::parent_window(native_window_type child, native_window_type new_parent, bool returns_previous)
 		{
 #ifdef NANA_WINDOWS
-			auto prev = reinterpret_cast<native_window_type>(
-						::SetParent(reinterpret_cast<HWND>(child), reinterpret_cast<HWND>(new_parent))
-					);
+			auto prev = ::SetParent(reinterpret_cast<HWND>(child), reinterpret_cast<HWND>(new_parent));
+
+			if (prev)
+				::PostMessage(prev, WM_CHANGEUISTATE, UIS_INITIALIZE, NULL);
 
 			::SetWindowPos(reinterpret_cast<HWND>(child), NULL, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_FRAMECHANGED);
 
-			return (returns_previous ? prev : nullptr);
+			return reinterpret_cast<native_window_type>(returns_previous ? prev : nullptr);
 #elif defined(NANA_X11)
 			native_window_type prev = nullptr;
 
diff --git a/source/gui/widgets/menu.cpp b/source/gui/widgets/menu.cpp
index fd206764..3e1159a5 100644
--- a/source/gui/widgets/menu.cpp
+++ b/source/gui/widgets/menu.cpp
@@ -526,17 +526,16 @@ namespace nana
 						auto index = state_.active;
 						for (auto & m : menu_->items)
 						{
+							if (0 == index--)
+								break;
+
 							if (m.flags.splitter)
 							{
 								pos.y += 2;
 								continue;
 							}
 
-							if (0 == index)
-								break;
-
 							pos.y += _m_item_height() + 1;
-							--index;
 						}
 
 						tmstamp = state_.active_timestamp;