2202 Commits

Author SHA1 Message Date
Jinhao
08077a9845 fix bug that wrong listbox selection after sorting 2018-01-13 13:08:43 +08:00
Jinhao
c80b4ce484 improve visualization of group caption 2018-01-13 13:07:40 +08:00
Jinhao
48be0b4b07 improve visualization of group caption 2018-01-13 10:49:37 +08:00
Jinhao
196d0bf351 Merge branch 'hotfix-1.5.6' into feature-listbox 2018-01-07 04:20:52 +08:00
Jinhao
970872c96f fix bug that integer overflow in progress widget 2018-01-07 04:18:23 +08:00
Jinhao
58b7bdf2f7 fix a stackoverflow error 2018-01-03 07:32:21 +08:00
Jinhao
be836b5b48 apply folding expression and std::optional 2017-12-23 00:10:10 +08:00
Jinhao
4917b18c70 deprecate std::iterator because of C++17 2017-12-20 13:51:32 +08:00
Jinhao
c66895ead6 apply C++17 folding expression 2017-12-20 11:53:29 +08:00
Jinhao
9d75d15474 add detection of C++17 folding experssion 2017-12-20 01:28:05 +08:00
Jinhao
5f77c73aaa no throw() 2017-12-19 03:30:38 +08:00
Jinhao
486e75f3ae apply constexpr if 2017-12-18 22:13:03 +08:00
Jinhao
1e551f4e55 add check for C++17 constexpr if 2017-12-18 22:10:01 +08:00
Jinhao
5653bd2416 fix crash where listbox::item_proxy==str 2017-12-13 06:28:12 +08:00
Jinhao
a653a7a3fa Merge branch 'develop' 2017-12-04 00:52:55 +08:00
Jinhao
81018c21fd add contribution info 2017-12-03 13:13:12 +08:00
qPCR4vir
5f947d5ec8 convenient generic_u8string(path) as workaround Boost not having path.generic_u8string()
- a good point for http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0251r0.pdf
2017-12-03 01:57:27 +01:00
qPCR4vir
16f835e083 enable directory_iterator range-based for statements while using Boost 2017-12-03 01:55:41 +01:00
qPCR4vir
d5d1ba3c9e Merge remote-tracking branch 'cnjinhao/develop' into develop
# Conflicts:
#	build/vc2017/nana.vcxproj.filters
2017-12-03 00:55:27 +01:00
Jinhao
63091349c0 Merge branch 'pavelxdd-boostfix' into develop 2017-12-01 22:19:25 +08:00
Jinhao
2086f0c258 Merge branch 'boostfix' of https://github.com/pavelxdd/nana into pavelxdd-boostfix 2017-12-01 22:18:13 +08:00
Jinhao
7369b5437c Merge branch 'hotfix-1.5.5' into develop 2017-12-01 17:56:06 +08:00
pavelxdd
7e68068c25 fix compilation with boost::filesystem
CMakeLists.txt:
---------------------------
Until now build with boost::filesystem was completely broken,
since cmake exported definitions with wrong name prefixes, and
nana always defaulted to internal filesystem implementation.

After fixing the boost definitions, a number of errors came up
due to incompatibility of boost::filesystem with nana and std
filesystems. This commit tries to fix them all.

filesystem.cpp, filesystem.hpp, filebox.cpp:
--------------------------------------------
boost::filesystem doesn't have a file_time_type, so declared
it in the filesystem.hpp header.

boost::filesystem::last_write_time has a return type std::time_t
unlike the other two implementations of this function in nana
and std, so added ifdef to convert the result to file_time_type.

fixed build on gcc-4.9, since it doesn't have a std::put_time
function, included <nana/stdc++.hpp> in that case.

boost::filesystem::file_type types have different names than
std::experimental::filesystem::file_type types, fixed it by
creating an enum class file_type with the same type names as
in std::experimental::filesystem::file_type. This fix
requires static_cast from functions results to internal file_type,
since boost file_type and std file_type a different enum classes.

changed switch to if, bacause old gcc fails on converting
enum class members to int.

stdc++.hpp:
-----------
added ifndef guards to prevent errors on multiple includes of this header.

wvl.cpp:
--------
added boost/chrono.hpp include for the cases when std::thread is not
available.

travis:
-------
added boost system, thread, chrono libs to install, they are needed
for the nana-demo to compile.
2017-11-28 06:22:17 +03:00
Jinhao
474ff25426 fix compiler error for Linux 2017-11-24 04:58:59 +08:00
Jinhao
dddd704786 Merge branch 'hotfix-1.5.5' into feature-listbox 2017-11-22 03:54:49 +08:00
Jinhao
bbc2dc2aea rename pixels() to width_px() 2017-11-22 00:29:09 +08:00
Jinhao
b71427334a listbox header font 2017-11-21 17:20:47 +08:00
Jinhao
14cc7cdaa1 fix issue that progress is incorrect when it is resized 2017-11-19 07:04:34 +08:00
Jinhao
77f7bdb37c fix bug that a font lapse after widget resizes 2017-11-14 02:06:48 +08:00
King_DuckZ
b713b01dbe Fix missing closing brace. 2017-11-10 00:49:46 +00:00
King_DuckZ
97297ae511 Fix cmake warning. 2017-11-10 00:46:08 +00:00
King_DuckZ
b9946f2624 Fix up some wrong parts I missed to conform with the rest of my changes. 2017-11-10 00:29:07 +00:00
King_DuckZ
32e6ee532c Fix build after rebase. 2017-11-10 00:16:50 +00:00
King_DuckZ
309a95d321 Maybe not needed anymore? 2017-11-10 00:10:11 +00:00
King_DuckZ
d3f5577625 These need be set *before* find_package, or it will be too late. 2017-11-10 00:10:11 +00:00
King_DuckZ
b5c69dc386 Use target_compile_definitions instead of add_definitions.
This allows macro definitions to be inherited. There might
be symbols that can be made private.
This is likely breaking the build on non-linux systems.
2017-11-10 00:10:11 +00:00
King_DuckZ
7f35b240b5 Remove the NANA_LINKS variable since it's not tracking what's really happening anymore. 2017-11-10 00:09:08 +00:00
King_DuckZ
bfba8fa233 Fix typo 2017-11-10 00:07:46 +00:00
King_DuckZ
872ed69519 Whitespace changes 2017-11-10 00:07:36 +00:00
King_DuckZ
a09d23210f Use target_include_directories instead of include_directories.
Also change the linked libraries where necessary and link
to fontconfig, which fixes my build error.
2017-11-10 00:06:57 +00:00
King_DuckZ
00c923df8f Use target_compile_features instead of setting CXX_STANDARD.
This allows child projects to just link to nana and automatically
inherit the -std=c++14 setting. Minimum cmake version for this
to work is 3.1.
2017-11-10 00:01:58 +00:00
Jinhao
60c85cff52 refactor picture widget 2017-11-06 05:56:08 +08:00
Jinhao
3dc7e3ae5b fix bug where picture throws if image is empty 2017-11-02 17:55:14 +08:00
Jinhao
74f5a8f40b fix caret issue 2017-11-02 16:36:23 +08:00
Jinhao
0796c1540b fix issue that listbox scheme mouse_wheel.lines has no effect 2017-11-01 11:57:52 +08:00
Jinhao
e5dc98bf4e Merge branch 'cjacker-xim_cursor_follow' into hotfix-1.5.5 2017-10-29 02:17:59 +08:00
Jinhao
2df2b21830 Merge branch 'xim_cursor_follow' of https://github.com/cjacker/nana into cjacker-xim_cursor_follow 2017-10-29 02:17:26 +08:00
Jinhao
c230f084ea Merge branch 'qPCR4vir-hotfix-1.5.5' into hotfix-1.5.5 2017-10-29 02:14:29 +08:00
Jinhao
f2e7a4c044 Merge branch 'hotfix-1.5.5' of https://github.com/qPCR4vir/nana into qPCR4vir-hotfix-1.5.5 2017-10-29 02:13:30 +08:00
Jinhao
a57c7ac409 Merge branch 'qPCR4vir-dev' into develop 2017-10-29 02:05:00 +08:00