update

.gitignore

@@ -1,7 +1,9 @@
-#This .gitignore created by qPCR4vir
-#ignore thumbnails created by windows
+# This .gitignore was created by qPCR4vir
+
+# ignore thumbnails created by windows
 Thumbs.db
-#Ignore files build by Visual Studio
+
+# Ignore files build by Visual Studio
 *.obj
 *.exe
 *.pdb
@@ -34,4 +36,13 @@ _ReSharper*/
 lib/
 bin/
 *.opendb
-.idea/
+.idea/
+*.VC.db
+.vs/
+
+# cmake bulids
+cmake-build*/
+
+# codelite
+.codelite/
+

.travis.yml

@@ -0,0 +1,131 @@
+sudo: false
+language: generic
+
+cache:
+  apt: true
+  directories:
+    - /tmp/tools
+
+matrix:
+  include:
+    - env: CXX=g++-8
+      addons:
+        apt:
+          packages:
+            - g++-8
+            - libjpeg8-dev
+            - libpng-dev
+            - libasound2-dev
+            - alsa-utils
+            - alsa-oss
+            - libx11-dev
+            - libxft-dev
+			- libxcursor-dev
+          sources:
+            - ubuntu-toolchain-r-test
+
+  allow_failures:		
+    - env: CXX=clang++-3.8 CC=clang-3.8
+      addons:
+        apt:
+          packages:
+            - clang-3.8
+            - libjpeg8-dev
+            - libpng-dev
+            - libasound2-dev
+            - alsa-utils
+            - alsa-oss
+            - libx11-dev
+            - libxft-dev
+            - libxcursor-dev
+          sources: 
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise 
+
+before_install:
+  # donwload, compile and install nana first
+  # we are in:  'user'/nana-demo/
+  - cd ..
+  # we are in:   'user'/
+  - git clone --depth=1 --branch=minor_change https://github.com/qPCR4vir/nana.git nana
+  # now we have 'user'/nana-demo, 'user'/nana/  and we are in: 'user'/
+  - export PATH="$HOME/bin:$PATH"
+  - wget --no-check-certificate --no-clobber -O /tmp/tools/cmake https://cmake.org/files/v3.12/cmake-3.12.0-rc1-Linux-x86_64.sh || true
+  - chmod -R +x /tmp/tools
+
+install:
+  - /tmp/tools/cmake --prefix="$HOME" --exclude-subdir
+
+before_script :
+  - mkdir demo-build
+  - cd demo-build
+  # now we have 'user'/nana-demo, 'user'/nana/ , 'user'/demo-build/ and we are in: 'user'/demo-build/
+
+services:
+  # travis don't have a physical monitor. We need to install an emulator:
+  # https://docs.travis-ci.com/user/gui-and-headless-browsers/
+  - xvfb
+
+script:
+  - cmake -G"Unix Makefiles" ../nana-demo -DCMAKE_INSTALL_PREFIX=.. -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=OFF -DNANA_CMAKE_BOOST_FILESYSTEM_FORCE=OFF -DNANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS=OFF -DNANA_CMAKE_AUTOMATIC_GUI_TESTING=ON -DNANA_CMAKE_INSTALL=OFF
+  - make install
+  # - ctest   # todo set correct working directory, and show output
+  # we have installed in 'user'/ ('user'/demo-build/..), and cmake created 'user'/nana-test/
+  # todo: separate resources from sources (a directory for images)
+  - ls -lh
+  # we were still in: 'user'/demo-build/
+  - cd ../nana-test/bin
+  - ls -lh
+  - ./a_group_impl
+  - ./animate-bmp
+  - ./audio_player
+  # - ./audio_player_simple   # just play music too long
+  - ./background-effects
+  - ./calculator          # COOL !!! https://travis-ci.org/qPCR4vir/nana/builds/621103509#L924
+  - ./categ
+  - ./clicked
+  - ./decore
+  - ./dock
+  - ./drag-button
+  - ./draw
+  - ./file_explorer
+  - ./example.button
+  - ./example_combox      # OK ! https://travis-ci.org/qPCR4vir/nana/builds/621103509#L1044
+  - ./example_listbox
+  - ./example_menu        # OK ! https://travis-ci.org/qPCR4vir/nana/builds/621103509#L1022
+  - ./filebox-txt         # https://travis-ci.org/qPCR4vir/nana/builds/621103509#L1068
+  - ./folder_tree_nana    # todo ok but failed https://travis-ci.org/qPCR4vir/nana/builds/621116812#L1193
+  - ./folder_tree_std     # todo ok but failed https://travis-ci.org/qPCR4vir/nana/builds/621116812#L1200
+  - ./framework_design_1
+  - ./framework_design_2
+  - ./framework_design_3
+  - ./group
+  - ./HelloWord
+  - ./helloword_quit      # ok
+  - ./inputbox            # ok
+  - ./label_listener
+  - ./lambda_event.Cpp11
+  - ./listbox_inline_widget
+  - ./listbox_Resolver
+  - ./loader_1
+  - ./loader_2            # ok
+  - ./main
+  - ./mbox
+  - ./menu_debug
+  - ./menu_popuper
+  - ./modal_form          # ok
+  - ./MontiHall           # ok
+  - ./place_login
+  - ./helloworld_demo     # ok
+  - ./notepad             # ok !!
+  - ./widget_show2        # ok !!
+  - ./widget_show         # ok !!
+  - ./png
+  - ./screen              # ok
+  - ./stretch_image
+  - ./textbox_line_number
+  - ./thread-pool          # ok
+  - ./threading            # ok
+  - ./various_events
+  - ./window-dragger       # ok
+  - ./windows-subclassing

CMakeLists.txt

@@ -1,103 +1,117 @@
-# CMake configuration for Nana Demos
-# Author: Carlos Nihelton(https://github.com/CarlosNihelton)
-# [email protected]
+# CMake configuration for Nana Demos and examples
+# Author: Ariel Vina-Rodriguez (qPCR4vir)
+# Prerequisites:
+# The source code of nana is in directory: ../nana
+# That is: your base directory have two directories: nana (with source code of nana),
+# and nana-demo. This cmake run in the nana-demo directory
+# deprecated:
+# Statically compiled nana.lib and the include directory of nana are in directory: ../nana_lib
+# That is: your base directory have two directories: nana_lib (with the nana.lib and the include/nana directory),
+# and nana-demo. This cmake run in the nana-demo directory
+#  |
+#  +  nana-demo         (directory with this file and all the others from nana-demo)
+#  +  nana_lib
+#         |
+#         +  lib        (directory with the staticaly complied nana library)
+#         +  include    (directory with all the nana include files)
+
+cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+project(nana_demo VERSION      1.6.2
+        DESCRIPTION "nana C++ GUI library demos and tests"
+        HOMEPAGE_URL http://nanapro.org
+        LANGUAGES CXX         )
+
+enable_testing()
+add_subdirectory(../nana ../cmake-nana-build-${CMAKE_BUILD_TYPE} )
+
+option(NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS "" OFF)
+option(NANA_CMAKE_BUILD_FreeMe "Build FreeMe (currently broken)?" OFF)
+
+function(set_nana_test dir files)
+    foreach ( test ${${files}})
+        add_executable(${test} "${${dir}}/${test}.cpp")
+        target_link_libraries(${test} PUBLIC nana)
+        if(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
+            #add_custom_command( TARGET  ${test} POST_BUILD COMMAND  ${test} )
+            #add_custom_target(do_always_${test} ALL COMMAND ${test})
+            add_test(NAME ${test} COMMAND ${test} WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/Examples)
+            message("... added test:  ${test}" )
+        endif(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
+        install(TARGETS ${test} RUNTIME DESTINATION "nana-test/bin")
+        message("... to build:  ${${dir}}/${test}.cpp" )
+    endforeach( test ${${files}})
+endfunction(set_nana_test)
+
+
+set (demos_dir ${CMAKE_CURRENT_LIST_DIR})
+set (demos    calculator file_explorer helloworld_demo notepad   widget_show  widget_show2   )
+# Pending:
+
+
+set (examples_dir ${CMAKE_CURRENT_LIST_DIR}/Examples)
+set (examples
+        a_group_impl       animate-bmp        audio_player       audio_player_simple
+        background-effects categ              clicked            windows-subclassing
+        dock               drag-button        draw               example.button
+        example_combox     example_listbox    example_menu       lambda_event.Cpp11
+        filebox-txt                           folder_tree_nana   folder_tree_std
+        framework_design_1 framework_design_2 framework_design_3 label_listener
+        group              HelloWord          helloword_quit     listbox_inline_widget
+        inputbox           listbox_Resolver   loader_1           loader_2
+        main mbox          menu_debug         menu_popuper       modal_form
+        MontiHall          place_login        png                textbox_line_number
+        stretch_image      threading          thread-pool        various_events
+        window-dragger     screen             decore
+        )
+# Pending:
+
+if (NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS)
+    list(APPEND demos  )
+    if (NANA_CMAKE_BUILD_FreeMe)
+        add_definitions(-DBUILD_FreeMe)
+        list(APPEND demos  FreeMe)
+    endif (NANA_CMAKE_BUILD_FreeMe)
+endif (NANA_CMAKE_INCLUDE_EXPERIMENTAL_DEMOS)
+
+
+set_nana_test(demos_dir demos)
+set_nana_test(examples_dir examples)
+# copy this dir to reuse e resources (images)
+install(DIRECTORY ${examples_dir} DESTINATION "nana-test")
+
+if (NANA_CMAKE_VERBOSE_PREPROCESSOR)
+    # Just for information:
+    include(CMakePrintHelpers)
+
+    cmake_print_properties(TARGETS file_explorer  PROPERTIES
+            COMPILE_DEFINITIONS   COMPILE_OPTIONS    COMPILE_FLAGS  LINK_LIBRARIES
+            INCLUDE_DIRECTORIES   INSTALL_NAME_DIR   LINK_FLAGS     VERSION
+            ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_NAME INSTALL_RPATH
+            )
+    cmake_print_variables(CONFIG)
+
+    message ( "CMAKE_CXX_COMPILER_ID   = "  ${CMAKE_CXX_COMPILER_ID})
+    message ( "COMPILER_IS_CLANG       = "  ${COMPILER_IS_CLANG})
+    message ( "CMAKE_COMPILER_IS_GNUCXX= "  ${CMAKE_COMPILER_IS_GNUCXX})
+    message ( "CMAKE_CXX_COMPILER_VERSION= "  ${CMAKE_CXX_COMPILER_VERSION})
+    message ( "CMAKE_CXX_FLAGS         = "  ${CMAKE_CXX_FLAGS})
+    message ( "CMAKE_EXE_LINKER_FLAGS  = "  ${CMAKE_EXE_LINKER_FLAGS})
+    message ( "CMAKE_STATIC_LINKER_FLAGS= "  ${CMAKE_STATIC_LINKER_FLAGS})
+    message ( "NANA_LINKS              = "  ${NANA_LINKS})
+    message ( "DESTDIR                 = "  ${DESTDIR})
+    message ( "CMAKE_INSTALL_PREFIX    = "  ${CMAKE_INSTALL_PREFIX})
+    message ( "NANA_CMAKE_ENABLE_AUDIO = "  ${NANA_CMAKE_ENABLE_AUDIO})
+    message ( "CMAKE_CURRENT_SOURCE_DIR= "  ${CMAKE_CURRENT_SOURCE_DIR})
+    message ( "CMAKE_CURRENT_DIR       = "  ${CMAKE_CURRENT_DIR})
+    message ( "CMAKE_CURRENT_BINARY_DIR= "  ${CMAKE_CURRENT_BINARY_DIR})
+    message ( "CMAKE_DEBUG_POSTFIX     = "  ${CMAKE_DEBUG_POSTFIX})
+
+    message ( "NANA_CMAKE_FIND_BOOST_FILESYSTEM         = "  ${NANA_CMAKE_FIND_BOOST_FILESYSTEM})
+    message ( "NANA_CMAKE_BOOST_FILESYSTEM_FORCE        = "  ${NANA_CMAKE_BOOST_FILESYSTEM_FORCE})
+    message ( "NANA_CMAKE_BOOST_FILESYSTEM_INCLUDE_ROOT = "  ${NANA_CMAKE_BOOST_FILESYSTEM_INCLUDE_ROOT})
+    message ( "NANA_CMAKE_BOOST_FILESYSTEM_LIB          = "  ${NANA_CMAKE_BOOST_FILESYSTEM_LIB})
+    message ( "NANA_CMAKE_AUTOMATIC_GUI_TESTING         = "  ${NANA_CMAKE_AUTOMATIC_GUI_TESTING})
+    message ( "NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING = "  ${NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING})
 
-cmake_minimum_required(VERSION 3.1)
-
-project(Nana_Demos)
-
-# 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")
-# endif(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-
-
-#Global MSVC definitions
-if(WIN32)
-	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(MSVC)
-endif(WIN32)
-
-
-#Unicode
-option(USE_UNICODE "Use Unicode Character Set")
-if(USE_UNICODE)
-    add_definitions(-DNANA_UNICODE)
-endif()
-
-if(APPLE)
-    add_definitions(-DAPPLE)
-    include_directories(/opt/X11/include/)
-elseif(UNIX)
-    add_definitions(-Dlinux)
-endif()
-
-
-
-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()
 
-#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)
-        find_package(PNG)
-        if (PNG_FOUND)
-            include_directories( ${PNG_INCLUDE_DIRS})
-            add_definitions(-DUSE_LIBPNG_FROM_OS)
-        endif()
-    endif()
-endif()
-
-#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)
-        find_package(JPEG)
-        if (JPEG_FOUND)
-            include_directories( ${JPEG_INCLUDE_DIRS})
-            add_definitions(-DUSE_LIBJPEG_FROM_OS)
-        endif()
-    endif()
-endif()
-
-#For my case I have separate dirs for Nana and Demos.
-include_directories(${CMAKE_SOURCE_DIR}/../nana/include)
-link_directories(${CMAKE_SOURCE_DIR}/../nana/ShadowBuild)
-
-add_executable(hello_world ${CMAKE_SOURCE_DIR}/Examples/HelloWord.cpp)
-set_property( TARGET hello_world PROPERTY CXX_STANDARD 14 )
-target_link_libraries(hello_world nana X11 pthread rt Xft)
-
-add_executable(file_explorer ${CMAKE_SOURCE_DIR}/file_explorer.cpp)
-set_property( TARGET file_explorer PROPERTY CXX_STANDARD 14 )
-target_link_libraries(file_explorer nana X11 pthread rt Xft)
-
-add_executable(widget_show ${CMAKE_SOURCE_DIR}/widget_show.cpp)
-set_property( TARGET widget_show PROPERTY CXX_STANDARD 14 )
-target_link_libraries(widget_show nana X11 pthread rt Xft)
-
-add_executable(widget_show2 ${CMAKE_SOURCE_DIR}/widget_show2.cpp)
-set_property( TARGET widget_show2 PROPERTY CXX_STANDARD 14 )
-target_link_libraries(widget_show2 nana X11 pthread rt Xft)