1314 Commits

Author SHA1 Message Date
Jinhao
eed3ffd5b6 Merge branch 'hotfix-1.4' into develop 2016-08-11 02:27:45 +08:00
Jinhao
9b28c96e9b code refine 2016-08-11 02:26:47 +08:00
Jinhao
ebfa079f3f fix bug that text_editor throws an exception when undo a backspace 2016-08-11 02:15:19 +08:00
Jinhao
e7b466fad8 Merge branch 'dankan1890-hotfix-1.4' into hotfix-1.4 2016-08-10 01:53:17 +08:00
Jinhao
6e86b6ae6c refine code
fix bug that listbox may throw std::runtime when the modal is enabled
fix bug that textbox attachs a wrong event angent
2016-08-10 01:46:13 +08:00
dankan1890
6fbc4a7988 Fixed the behavior of disabled items in the menus when scrolling with the arrows keys. 2016-08-01 03:20:07 +02:00
Jinhao
df5a786965 fix a bug that listbox::cat_proxy::append<T> throws if model enabled 2016-07-31 04:11:39 +08:00
Jinhao
34cca34773 fix the behaviour of clicking menu disabled item 2016-07-26 07:32:50 +08:00
Jinhao
1ce033c4b3 Merge branch 'develop' into hotfix-1.4 2016-07-22 06:49:37 +08:00
Jinhao
185a2961d1 Merge branch 'qPCR4vir-develop' into develop 2016-07-20 07:47:23 +08:00
qPCR4vir
62d1d11817 Merge remote-tracking branch 'nana_jh/develop' into develop 2016-07-19 18:53:16 +02:00
qPCR4vir
f81b730c5c listbox stable_sort 2016-07-19 18:20:43 +02:00
Jinhao
2f716cb83f Merge branch 'hotfix-1.3' into develop 2016-07-19 23:50:11 +08:00
Jinhao
daec65b0e0 Merge branch 'hotfix-1.3' 2016-07-19 23:49:47 +08:00
Jinhao
8ddb4926fb Merge branch 'develop' 2016-07-19 23:47:41 +08:00
Jinhao
c5e3fd2ec8 update extrlib/readme.txt 2016-07-19 23:28:00 +08:00
Jinhao
7229c76807 fix some compiler errors on x64 2016-07-18 04:21:05 +08:00
Jinhao
98483d3e40 fix crash in linux because of compiler bug(GCC 4.8) 2016-07-18 02:36:18 +08:00
Jinhao
56697b331a improve text_editor 2016-07-17 20:58:00 +08:00
Jinhao
152da8e98f Merge branch 'dankan1890-compiler' into develop 2016-07-17 10:28:05 +08:00
Jinhao
2ad0b1e382 Merge branch 'compiler' of https://github.com/dankan1890/nana into dankan1890-compiler 2016-07-17 10:27:44 +08:00
Jinhao
29446b5ef0 fix crash when adding a header to a zero-size listbox(#147) 2016-07-17 10:23:20 +08:00
dankan1890
de777617ff c++ defines patch:
# Recent versions of clang have support for make_unique.
# Check if macro "__cpp_lib_experimental_filesystem" is defined and match with the standard value.
2016-07-13 22:12:29 +02:00
Jinhao
0a0fab679b fix some issues that are detected by PVS-studio team 2016-07-14 00:41:34 +08:00
Jinhao
31455aa165 fix listbox horiz scroll issue(#145) 2016-07-14 00:15:50 +08:00
Jinhao
9b91d3b55f listbox and place code refined 2016-07-13 23:00:03 +08:00
Jinhao
49dfaca1ef fix a crash when the listbox inserts an item. 2016-07-13 22:57:13 +08:00
Jinhao
02acc4c216 listbox code refined 2016-07-13 08:14:27 +08:00
Jinhao
5d5a808b2d remove overloading assignment operator of rectangle 2016-07-13 08:00:59 +08:00
Jinhao
8489e16d72 make listbox::index_pair constructor explicit 2016-07-11 04:12:04 +08:00
Jinhao
ffdfb46eae fix caret color issue for X 2016-07-09 15:47:51 +08:00
Jinhao
6ee314a9ea fix a bug that msgbox uses local codepage 2016-07-09 10:27:18 +08:00
Jinhao
e73fc679f4 improve tabbar::attach 2016-07-07 07:57:48 +08:00
Jinhao
5340c4f670 fix mouse wheel step which is restored by merging listbox-model 2016-07-07 07:09:40 +08:00
Jinhao
ce81495bf3 Merge branch 'dankan1890-develop' into develop 2016-07-03 22:11:51 +08:00
Jinhao
c7fbfe86ba Merge branch 'develop' of https://github.com/dankan1890/nana into dankan1890-develop 2016-07-03 22:11:24 +08:00
Jinhao
224b08a800 Merge branch 'qPCR4vir-develop' into develop 2016-07-03 21:53:56 +08:00
Jinhao
a55006ef91 Merge branch 'develop' of https://github.com/qPCR4vir/nana into qPCR4vir-develop 2016-07-03 21:53:36 +08:00
Jinhao
d38c4839bc Merge branch 'listbox-model' into develop 2016-07-03 21:24:20 +08:00
Jinhao
8c7051566c optimize binary size 2016-07-01 23:43:48 +08:00
dankan1890
72768fd788 fix PNG build. 2016-06-30 20:46:02 +02:00
qPCR4vir
ddc88e0af0 travis test with nana-demo/develop branch 2016-06-30 17:54:51 +02:00
qPCR4vir
eb9a31676f Merge remote-tracking branch 'nana_jh/develop' into tests 2016-06-30 17:04:04 +02:00
qPCR4vir
bb79dcbefc return optional librarirs first in cmake 2016-06-30 16:35:11 +02:00
qPCR4vir
b5706bab17 make install only (in travis) 2016-06-30 16:05:47 +02:00
qPCR4vir
87d8f692c5 cleaning 2016-06-30 15:57:41 +02:00
Jinhao
b32afa282c minor change 2016-06-28 21:21:47 +08:00
Jinhao
9bb6d1628b Merge branch 'qPCR4vir-tests' into develop 2016-06-28 21:08:07 +08:00
qPCR4vir
8b19d0d12e FIX compiler error SPI_GETWHEELSCROLLCHARS not found 2016-06-28 14:00:16 +02:00
qPCR4vir
1a0761c59b - cd ../bin 2016-06-27 17:00:36 +02:00