mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/minor_change' into minor_change

Browse Source
This commit is contained in:
qPCR4vir 2019-12-06 01:30:48 +01:00
commit dd72ef8fbd
3 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
.travis.yml
View File

@ -43,8 +43,12 @@ matrix:
- llvm-toolchain-precise - llvm-toolchain-precise
before_install: before_install:
# donwload nana-demo first
# we are in: 'user'/nana/
- cd .. - cd ..
- git clone --depth=1 --branch=hotfix https://github.com/qPCR4vir/nana-demo.git nana-demo # we are in: 'user'/
- git clone --depth=1 --branch=master https://github.com/qPCR4vir/nana-demo.git nana-demo
# now we have 'user'/nana-demo, 'user'/nana/ and we are in: 'user'/
- export PATH="$HOME/bin:$PATH" - 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-rc3-Linux-x86_64.sh || true - wget --no-check-certificate --no-clobber -O /tmp/tools/cmake https://cmake.org/files/v3.12/cmake-3.12.0-rc3-Linux-x86_64.sh || true
- chmod -R +x /tmp/tools - chmod -R +x /tmp/tools
@ -53,27 +57,29 @@ install:
- /tmp/tools/cmake --prefix="$HOME" --exclude-subdir - /tmp/tools/cmake --prefix="$HOME" --exclude-subdir
before_script : before_script :
# we have: qPCR4vir/nana/../nana-demo and now we are in: qPCR4vir/nana/ our executable tests will access: ../nana-demo/Examples/*.bmp etc.(need to be in parallel with nana-demo/Examples) - mkdir demo-build
#- cd ../nana-demo
- mkdir demo-build
- cd demo-build - cd demo-build
# now we have 'user'/nana-demo, 'user'/nana/ , 'user'/demo-build/ and we are in: 'user'/demo-build/
services: services:
- # travis don't have a physical monitor. We need to install an emulator: https://docs.travis-ci.com/user/gui-and-headless-browsers/ # travis don't have a physical monitor. We need to install an emulator:
# https://docs.travis-ci.com/user/gui-and-headless-browsers/
- xvfb - xvfb
script: script:
- cmake -G"Unix Makefiles" ../nana-demo -DCMAKE_INSTALL_PREFIX=.. -DNANA_CMAKE_ENABLE_JPEG=ON -DNANA_CMAKE_FIND_BOOST_FILESYSTEM=OFF -DNANA_CMAKE_AUTOMATIC_GUI_TESTING=ON -DNANA_CMAKE_INSTALL=OFF - cmake -G"Unix Makefiles" ../nana-demo -DCMAKE_INSTALL_PREFIX=.. -DNANA_CMAKE_ENABLE_JPEG=ON -DNANA_CMAKE_FIND_BOOST_FILESYSTEM=OFF -DNANA_CMAKE_AUTOMATIC_GUI_TESTING=ON -DNANA_CMAKE_INSTALL=OFF
- make install - make install
# we have installed in 'user'/ ('user'/demo-build/..), and cmake created 'user'/nana-test/
# todo: separate resources from sources (a directory for images) # todo: separate resources from sources (a directory for images)
- ls - ls
# we were still in: 'user'/demo-build/
- cd ../nana-test/bin - cd ../nana-test/bin
- ls - ls -lh
- ./a_group_impl - ./a_group_impl
- ./animate-bmp - ./animate-bmp
- ./audio_player - ./audio_player
- ./background-effects - ./background-effects
#- ./calculator # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1159 - ./calculator # COOL !!! https://travis-ci.org/qPCR4vir/nana/builds/621103509#L924
- ./categ - ./categ
- ./clicked - ./clicked
- ./decore - ./decore
@ -81,48 +87,45 @@ script:
- ./drag-button - ./drag-button
- ./draw - ./draw
- ./file_explorer - ./file_explorer
#- ./example_menu # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1348 - ./example_menu # OK ! https://travis-ci.org/qPCR4vir/nana/builds/621103509#L1022
- ./example_listbox - ./example_listbox
#- ./example_combox # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1378 - ./example_combox # OK ! https://travis-ci.org/qPCR4vir/nana/builds/621103509#L1044
- ./example.button - ./example.button
#- ./filebox-txt # https://travis-ci.org/qPCR4vir/nana/jobs/140250744#L1393 # - ./filebox-txt # https://travis-ci.org/qPCR4vir/nana/builds/621103509#L1068
- ./folder_tree - ./folder_tree_nana # todo failed https://travis-ci.org/qPCR4vir/nana/builds/621116812#L1193
#- ./folder_tree_nana # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1408 - ./folder_tree_std # todo failed https://travis-ci.org/qPCR4vir/nana/builds/621116812#L1200
#- ./folder_tree_std # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1421
- ./framework_design_1 - ./framework_design_1
- ./framework_design_2 - ./framework_design_2
- ./framework_design_3 - ./framework_design_3
- ./group - ./group
- ./HelloWord - ./HelloWord
#- ./helloword_quit # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1572 - ./helloword_quit # ok
#- ./inputbox # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1585 - ./inputbox # ok
- ./label_listener - ./label_listener
- ./lambda_event.Cpp11 - ./lambda_event.Cpp11
- ./listbox_inline_widget - ./listbox_inline_widget
- ./listbox_Resolver - ./listbox_Resolver
- ./loader_1 - ./loader_1
#- ./loader_2 # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1732 - ./loader_2 # ok
- ./mbox - ./mbox
- ./main - ./main
- ./menu_debug - ./menu_debug
#- ./modal_form # https://travis-ci.org/qPCR4vir/nana/jobs/140250744#L1736 - ./modal_form # ok
#- ./MontiHall # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1775 - ./MontiHall # ok
#- ./helloworld_demo # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1786 - ./helloworld_demo # ok
#- ./notepad # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1799 - ./notepad # ok !!
- ./menu_debug - ./menu_popuper
- ./menu_popuper - ./widget_show2 # ok !!
#- ./modal_form # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1846 - ./widget_show # ok !!
#- ./widget_show2 # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1730
#- ./widget_show # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1740
- ./place_login - ./place_login
- ./png - ./png
#- ./screen # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1909 - ./screen # ok
- ./stretch_image - ./stretch_image
#- ./threading # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1826 ?
#- ./thread-pool # https://travis-ci.org/qPCR4vir/nana/jobs/140247564#L1782
- ./various_events
#- ./window-dragger # https://travis-ci.org/qPCR4vir/nana/jobs/140245438#L1820
- ./windows-subclassing
- ./textbox_line_number - ./textbox_line_number
- ./threading # ok
- ./thread-pool # ok
- ./various_events
- ./window-dragger # ok
- ./windows-subclassing

4
build/cmake/shared_libs.cmake
View File

@ -39,8 +39,8 @@ endif()
if(NANA_STATIC_STDLIB) if(NANA_STATIC_STDLIB)
target_link_libraries(nana target_link_libraries(nana
PUBLIC PUBLIC
$<$<CXX_COMPILER_ID:GNU>:-static-libgcc> $<$<CXX_COMPILER_ID:GNU>:-static-libgcc -static-libstdc++>
$<$<CXX_COMPILER_ID:Clang>:-static-libstdc++> $<$<CXX_COMPILER_ID:Clang>:-static-libgcc -static-libstdc++>
) )
endif() endif()

7
source/paint/image.cpp
View File

@ -1,4 +1,4 @@
/* /**
* Paint Image Implementation * Paint Image Implementation
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com)
@ -7,9 +7,8 @@
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)
* *
* @file: nana/paint/image.cpp * @file nana/paint/image.cpp
* @contributors: * @contributors nabijaczleweli(pr#106)
* nabijaczleweli(pr#106)
*/ */
#include <nana/push_ignore_diagnostic> #include <nana/push_ignore_diagnostic>