Merge branch 'qPCR4vir-hotfix-1.3' into hotfix-1.3

.gitignore

@@ -24,6 +24,7 @@ build/makefile-bkl/*
 *.ilk
 *.log
 [Bb]in
+[Bb]in/
 [Dd]ebug*/
 *.lib
 *.a

.travis.yml

@@ -56,7 +56,7 @@ matrix:
             - llvm-toolchain-precise 
 
 before_install:
-  - git clone --depth=50 --branch=testing https://github.com/qPCR4vir/nana-demo.git nana-demo
+  - git clone --depth=1 --branch=dev_nana_in_examples https://github.com/qPCR4vir/nana-demo.git nana-demo
   - export PATH="$HOME/bin:$PATH"
   - mkdir ~/bin
   - wget --no-check-certificate --no-clobber -O /tmp/tools/cmake https://cmake.org/files/v3.4/cmake-3.4.0-rc3-Linux-x86_64.sh || true
@@ -66,11 +66,71 @@ install:
   - /tmp/tools/cmake --prefix="$HOME" --exclude-subdir
 
 before_script :
-  - mkdir bld
+  # travis dont have a fisical monitor. We need to instal an emulator: https://docs.travis-ci.com/user/gui-and-headless-browsers/
-  - cd bld
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 3 # give xvfb some time to start
+  # we have:  qPCR4vir/nana/nana-demo and  now we are in: qPCR4vir/nana/  our executable tests will assces: ../Examples/*.bmp etc.(need to be in parallel with nana-demo/Examples)
+  #- cd nana-demo
+  - mkdir bin
+  - cd bin
 
 script:
-  - cmake -G"Unix Makefiles" .. -DNANA_CMAKE_ENABLE_JPEG=ON -DNANA_CMAKE_ENABLE_PNG=OFF -DNANA_CMAKE_BUILD_DEMOS=ON -DNANA_CMAKE_ENABLE_AUDIO=OFF -DNANA_CMAKE_FIND_BOOST_FILESYSTEM=ON -DNANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS=OFF -DNANA_CMAKE_AUTOMATIC_GUI_TESTING=ON -DNANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING=ON
+  - cmake -G"Unix Makefiles" .. -DNANA_CMAKE_ENABLE_JPEG=ON -DNANA_CMAKE_ENABLE_PNG=OFF -DNANA_CMAKE_BUILD_DEMOS=ON -DNANA_CMAKE_ENABLE_AUDIO=OFF -DNANA_CMAKE_FIND_BOOST_FILESYSTEM=ON -DNANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS=OFF -DNANA_CMAKE_AUTOMATIC_GUI_TESTING=ON
   - make
+  - cd ..
+  - mv -v bin/ nana-demo/
+  - cd nana-demo/bin
   - ls
+  - ./a_group_impl
+  - ./animate-bmp
+  - ./audio_player
+  - ./background-effects
+  #- ./calculator 
+  - ./categ
+  - ./clicked
+  - ./decore
+  - ./dock
+  - ./drag-button
+  - ./draw
+  - ./file_explorer
+  #- ./example_menu
+  - ./example_listbox
+  #- ./example_combox
+  - ./example.button
+  #- ./folder_tree_nana
+  #- ./folder_tree_std
+  - ./framework_design_1
+  - ./framework_design_2
+  - ./framework_design_3
+  - ./group
+  - ./HelloWord
+  #- ./helloword_quit
+  #- ./inputbox  
+  - ./label_listener  
+  #- ./lambda_event.cpp11  
+  - ./listbox_inline_widget  
+  - ./listbox_Resolver  
+  - ./loader_1  
+  #- ./loader_2  
+  - ./mbox  
+  - ./menu_debug  
+  #- ./MontiHall
+  #- ./helloworld_demo 
+  #- ./notepad 
+  - ./menu_debug  
+  - ./menu_popuper  
+  #- ./modal_form   
+  #- ./widget_show2
+  #- ./widget_show
+  - ./place_login  
+  - ./png  
+  #- ./screen  
+  - ./stretch_image  
+  - ./threading  
+  #- ./thread-pool  
+  - ./various_events  
+  #- ./window-dragger
+  - ./windows-subclassing   
+
 

CMakeLists.txt

@@ -30,7 +30,6 @@ option(NANA_CMAKE_STOP_VERBOSE_PREPROCESSOR "Stop compilation after showing the
 option(NANA_CMAKE_BUILD_DEMOS "Build all the demos form the nana_demo repository." OFF)
 option(NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS "" ON)
 option(NANA_CMAKE_AUTOMATIC_GUI_TESTING "Activate automatic GUI testing?" OFF)
-option(NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING "Add defoult automatic GUI test?" OFF)
 option(NANA_CMAKE_BUILD_FreeMe "Build FreeMe (currently broken)?" OFF)
 
 
@@ -177,22 +176,6 @@ if(NANA_CMAKE_ENABLE_AUDIO)
     endif(UNIX)
 endif(NANA_CMAKE_ENABLE_AUDIO)
 
-if (NANA_CMAKE_BUILD_FreeMe)
-    add_definitions(-DBUILD_FreeMe)
-endif (NANA_CMAKE_BUILD_FreeMe)
-
-
-if(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
-    add_definitions(-DNANA_AUTOMATIC_GUI_TESTING)
-
-    if(NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING)
-        add_definitions(-DNANA_ADD_DEF_AUTOMATIC_GUI_TESTING)
-    endif(NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING)
-
-endif(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
-
-
-
 if(NANA_CMAKE_VERBOSE_PREPROCESSOR)
     add_definitions(-DVERBOSE_PREPROCESSOR)
 endif(NANA_CMAKE_VERBOSE_PREPROCESSOR)
@@ -261,11 +244,7 @@ if (NANA_CMAKE_BUILD_DEMOS)
          enable_testing ()
 	endif(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
 
-	if(NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING)
+    set (demos    calculator file_explorer helloworld_demo notepad        )
-	     add_definitions(-DNANA_ADD_DEF_AUTOMATIC_GUI_TESTING)
-	endif(NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING)
-	
-    set (demos     helloworld_demo notepad        )
 
     foreach ( demo ${demos})
         add_executable(${demo} "../nana-demo/${demo}.cpp")
@@ -274,16 +253,20 @@ if (NANA_CMAKE_BUILD_DEMOS)
         #if(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
             #add_custom_command( TARGET  ${demo} POST_BUILD COMMAND  ${demo} )
             #add_custom_target(do_always_${demo} ALL COMMAND ${demo})
-            add_test(${demo} COMMAND ${demo})
+            #add_test(${demo} COMMAND ${demo})
         #endif(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
         install(TARGETS ${demo} RUNTIME DESTINATION  "../nana-demo/")
         message("... to build: ../nana-demo/${demo}.cpp" )
     endforeach( demo ${demos})
 
-    set (demos     calculator  widget_show widget_show2      )
+    set (demos    widget_show widget_show2      )
+
+if (NANA_CMAKE_BUILD_FreeMe)
+    add_definitions(-DBUILD_FreeMe)
+endif (NANA_CMAKE_BUILD_FreeMe)
 
     if (NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS)
-        list(APPEND demos  file_explorer FreeMe)
+        list(APPEND demos  FreeMe)    # ??
     endif (NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS)
     # Pending:      FreeMe (added but really completelly compiled if defined BUILD_FreeMe  )
 
@@ -300,7 +283,7 @@ if (NANA_CMAKE_BUILD_DEMOS)
                   decore dock  drag-button  draw example.button example_combox example_listbox example_menu
                   filebox-txt folder_tree folder_tree_nana folder_tree_std framework_design_1 framework_design_2 framework_design_3
                   group HelloWord helloword_quit inputbox label_listener lambda_event.Cpp11 listbox_inline_widget listbox_Resolver loader_1 loader_2
-                  mbox menu_debug menu_popuper modal_form MontiHall place_login png screen stretch_image
+                  main mbox menu_debug menu_popuper modal_form MontiHall place_login png screen stretch_image
                   threading thread-pool various_events window-dragger windows-subclassing
                   )
     # Pending: 

include/nana/config.hpp

@@ -96,15 +96,11 @@
 
 ///////////////////
 //  Support for NANA_AUTOMATIC_GUI_TESTING
-//	  Will cause the program to self-test the GUI.
+//	  Will cause the program to self-test the GUI. A default automatic GUI test 
-//    If NANA_ADD_DEF_AUTOMATIC_GUI_TESTING is also defined a default automatic GUI test
 //    will be added to all programs which don't have yet one defined. This default test will simple
 //    wait 10 sec. (time to construct, show and execute the GUI) and then exit normally.
 //
 //#define NANA_AUTOMATIC_GUI_TESTING
-//#if defined(NANA_AUTOMATIC_GUI_TESTING)
-	//#define NANA_ADD_DEF_AUTOMATIC_GUI_TESTING
-//#endif
 
 
 

include/nana/gui/detail/bedrock.hpp

@@ -1,13 +1,15 @@
-/*
+/**
  *	A Bedrock Implementation
  *	Nana C++ Library(http://www.nanapro.org)
- *	Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
+ *	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/gui/detail/bedrock.hpp
+ *	@file nana/gui/detail/bedrock.hpp
+ *
+ *  @brief A Bedrock Implementation
  */
 
 #ifndef NANA_GUI_DETAIL_BEDROCK_HPP
@@ -26,9 +28,8 @@ namespace detail
 	struct	basic_window;
 	class	window_manager;
 
-	//class bedrock
+	
-	//@brief:	bedrock is a fundamental core component, it provides a abstract to the OS platform
+	/// @brief	fundamental core component, it provides an abstraction to the OS platform and some basic functions.
-	//			and some basic functions.
 	class bedrock
 	{
 		bedrock();

include/nana/gui/programming_interface.hpp

@@ -143,9 +143,17 @@ namespace API
 		};
 	}//end namespace detail
 
-	void exit();
+	void exit();	    ///< close all windows in current thread
+	void exit_all();	///< close all windows 
 
-	std::string transform_shortkey_text(std::string text, wchar_t &shortkey, std::string::size_type *skpos);
+	/// @brief	Searchs whether the text contains a '&' and removes the character for transforming.
+	///			If the text contains more than one '&' charachers, the others are ignored. e.g
+	///			text = "&&a&bcd&ef", the result should be "&abcdef", shortkey = 'b', and pos = 2.
+	std::string transform_shortkey_text
+					( std::string text,      ///< the text is transformed
+					  wchar_t &shortkey,     ///<  the character which indicates a short key.
+					  std::string::size_type *skpos ///< retrives the shortkey position if it is not a null_ptr;
+					);
 	bool register_shortkey(window, unsigned long);
 	void unregister_shortkey(window);
 

include/nana/gui/wvl.hpp

@@ -1,14 +1,14 @@
-/*
+/**
  *	Nana GUI Library Definition
  *	Nana C++ Library(http://www.nanapro.org)
- *	Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
+ *	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/gui/wvl.hpp
+ *	@file nana/gui/wvl.hpp
- *	@description:
+ *	@description
  *		the header file contains the files required for running of Nana.GUI
  */
 
@@ -16,7 +16,6 @@
 #define NANA_GUI_WVL_HPP
 
 
-
 #include "programming_interface.hpp"
 #include "screen.hpp"
 #include "widgets/form.hpp"
@@ -24,6 +23,7 @@
 #include "msgbox.hpp"
 #include "place.hpp"
 
+
 namespace nana
 {
 	namespace detail
@@ -60,7 +60,25 @@ namespace nana
     template<typename Form, bool IsVisible = true>
     using form_loader = detail::form_loader<Form, IsVisible>;
 
-	void exec(unsigned wait = 0, std::function<void()> = {}, unsigned wait_end=0, form *fm= nullptr);
+	/// @brief  Take control of the GUI and optionaly automaticaly tests it.
+	///
+	/// @detail It transfers to nana the program flow control, which begin pumping messages 
+	///         from the underlying OS, interpreting and sending it with suitable arguments 
+	///         to the nana widgets that registered a response in the corresponding event.	
+	///         It also accept arguments to be used in case of automatic GUI testing.	
+	///         Other Way the arguments are ignored. 
+	void exec(
+		      unsigned wait = 1,         ///< for the GUI to be constructed, in seconds  
+		      unsigned wait_end = 1,     ///< for the GUI to be destructed, in seconds
+		      std::function<void()> = {} ///< emit events to mimics user actions and may asert results
+	         );
+
+	/// send a click message to this widget - useffull in GUI testing
+	void click(widget& w);
+
+	/// in seconds
+	void Wait(unsigned wait = 0);
+
  
 }//end namespace nana
 #endif

source/gui/detail/bedrock_windows.cpp

@@ -1,4 +1,4 @@
-/*
+/**
  *	A Bedrock Implementation
  *	Nana C++ Library(http://www.nanapro.org)
  *	Copyright(C) 2003-2016 Jinhao(cnjinhao@hotmail.com)
@@ -7,7 +7,8 @@
  *	(See accompanying file LICENSE_1_0.txt or copy at
  *	http://www.boost.org/LICENSE_1_0.txt)
  *
- *	@file: nana/gui/detail/win32/bedrock.cpp
+ *	@file nana/gui/detail/win32/bedrock.cpp
+ *  @brief A Bedrock Implementation
  *	@contributors: Ariel Vina-Rodriguez
  */
 
@@ -18,6 +19,7 @@
 #include <nana/gui/detail/event_code.hpp>
 #include <nana/system/platform.hpp>
 #include <sstream>
+#include <iostream>
 #include <nana/system/timepiece.hpp>
 #include <nana/gui.hpp>
 #include <nana/gui/detail/inner_fwd_implement.hpp>
@@ -254,6 +256,7 @@ namespace detail
 		{
 			std::stringstream ss;
 			ss<<"Nana.GUI detects a memory leaks in window_manager, "<<static_cast<unsigned>(wd_manager().number_of_core_window())<<" window(s) are not uninstalled.";
+			std::cerr << ss.str();  /// \todo add list of cations of open windows and if aut testin GUI do auto Ok after 2 sec.
 			::MessageBoxA(0, ss.str().c_str(), ("Nana C++ Library"), MB_OK);
 		}
 
@@ -261,8 +264,8 @@ namespace detail
 		delete pi_data_;
 	}
 
-	//inc_window
+
-	//@brief: increament the number of windows
+	/// @brief increament the number of windows in the thread id
 	int bedrock::inc_window(unsigned tid)
 	{
 		//impl refers to the object of private_impl, the object is created when bedrock is creating.
@@ -461,6 +464,7 @@ namespace detail
 		{
 			(msgbox(modal_window, "An exception during message pumping!").icon(msgbox::icon_information)
 				<<"An uncaptured non-std exception during message pumping!"
+				<< "\n   in form: " << API::window_caption(modal_window)
 				).show();
 			internal_scope_guard lock;
 			_m_except_handler();

source/gui/programming_interface.cpp

@@ -326,7 +326,7 @@ namespace API
 
 		return nullptr;
 	}
-	//exit
+
 	//close all windows in current thread
 	void exit()
 	{
@@ -363,6 +363,42 @@ namespace API
 				interface_type::close_window(i);
 		}
 	}
+	//close all windows  
+	void exit_all()
+	{
+		std::vector<basic_window*> v;
+
+		internal_scope_guard lock;
+		restrict::wd_manager().all_handles(v);
+		if (v.size())
+		{
+			std::vector<native_window_type> roots;
+			native_window_type root = nullptr;
+			//unsigned tid = nana::system::this_thread_id();
+			for (auto wd : v)
+			{
+				if (/*(wd->thread_id == tid) &&*/ (wd->root != root))
+				{
+					root = wd->root;
+					bool exists = false;
+					for (auto i = roots.cbegin(); i != roots.cend(); ++i)
+					{
+						if (*i == root)
+						{
+							exists = true;
+							break;
+						}
+					}
+
+					if (!exists)
+						roots.push_back(root);
+				}
+			}
+
+			for (auto i : roots)
+				interface_type::close_window(i);
+		}
+	}
 
 	//transform_shortkey_text
 	//@brief:	This function searchs whether the text contains a '&' and removes the character for transforming.

source/gui/wvl.cpp

@@ -14,19 +14,9 @@
 #include <nana/gui/wvl.hpp>
 #include <nana/gui/detail/bedrock.hpp>
 #include <thread>
-
 #include <iostream> 
 
-
+//#define NANA_AUTOMATIC_GUI_TESTING
-inline unsigned Wait_or_not(unsigned wait = 0)
-{
-#ifdef NANA_AUTOMATIC_GUI_TESTING
-	return wait;
-#else
-	return 0;
-#endif
-}
-
 namespace nana
 {
 	namespace detail
@@ -37,38 +27,63 @@ namespace nana
 		}
 	}
 
-	void exec(unsigned wait, std::function<void()> f, unsigned wait_end, form *fm )
+	void click(widget& w)
 	{
-		#ifdef NANA_ADD_DEF_AUTOMATIC_GUI_TESTING
+		std::cout << "Automatically clicking widget "<<w.caption()<<":\n";
-				if (!wait)
+		arg_click arg;
-					wait = 10;
+		arg.window_handle = w.handle();
-				if (!f)
+		w.events().click.emit(arg);
-					f = []() {API::exit(); };
+	}
-		#endif
 
-		wait = Wait_or_not(wait);
+	/// in seconds
+	void Wait(unsigned wait)
+	{
+		if (!wait) return;
+		std::cout << "waiting " << wait << " sec...\n";
+		std::this_thread::sleep_for(std::chrono::seconds{ wait });
+	}
+
+	void pump()
+	{
+		detail::bedrock::instance().pump_event(nullptr, false);
+	}
+
+
+	void exec(
+		unsigned wait,         // = 1,      ///< for the GUI to be constructed, in seconds  
+		unsigned wait_end,     // = 1,      ///< for the GUI to be destructed, in seconds
+		std::function<void()>f // = {}      ///< emit events to mimics user actions and may asert results
+	)
+	{
+	#ifdef NANA_AUTOMATIC_GUI_TESTING
 			
 	    std::cout << "Will wait " << wait << " sec...\n";
-		std::thread t([wait, &f, wait_end, fm]()
+
-		              { if (wait) 
+	    std::thread t([wait, &f, wait_end]()
 			{ 
-							   std::cout << "Waiting " << wait << " sec...\n";
+				Wait( wait );
-							   std::this_thread::sleep_for(std::chrono::seconds{ wait } ); 
 				std::cout << "running... \n"  ;
+				if (f)
+				{
 					f();
-							   std::cout << "Done... \n";
+					std::cout << "\nCongratulations, this was not trivial !" << std::endl;
-							   std::cout << "Now waiting anothers " << wait_end << " sec...\n";
+				}else
-							   std::this_thread::sleep_for(std::chrono::seconds{ wait_end } );
+				{
-							   std::cout << "Done... \n";
+					std::cout << "\nJust a trivial test." << std::endl;
-							   if (fm)
-								   fm->close();
-							   API::exit();    // why not works?
 				}
+				std::cout << "Done... \n";
+				std::cout << "Now again ";
+				Wait(wait_end);
+				std::cout << "Done... Now API::exit all ...\n";
+				API::exit_all();   
 			});		
 
-		detail::bedrock::instance().pump_event(nullptr, false);
+		pump();
-
 		if (t.joinable())
 			t.join();
+
+    #else
+			pump();
+	#endif
 	}
 }//end namespace nana