1168 Commits

Author SHA1 Message Date
Jinhao
c0c3cfebe8 Merge branch 'dankan1890-listbox_fix' into hotfix-1.4.1 2016-12-01 07:29:06 +08:00
Jinhao
4467ed42b2 Merge branch 'listbox_fix' of https://github.com/dankan1890/nana into dankan1890-listbox_fix 2016-12-01 07:28:48 +08:00
dankan1890
d3743b4ccd Sorry for this. 2016-11-30 22:14:01 +01:00
Jinhao
ddf62c36fe Merge branch 'dankan1890-listbox_fix' into hotfix-1.4.1 2016-12-01 04:38:06 +08:00
Jinhao
cae84fe059 Merge branch 'listbox_fix' of https://github.com/dankan1890/nana into dankan1890-listbox_fix 2016-12-01 03:41:33 +08:00
Jinhao
8e2165c560 Merge branch 'dankan1890-uninitialized_variables' into hotfix-1.4.1 2016-12-01 03:37:53 +08:00
Jinhao
f7f59c1433 Merge branch 'uninitialized_variables' of https://github.com/dankan1890/nana into dankan1890-uninitialized_variables 2016-12-01 03:37:25 +08:00
Jinhao
8111a6b17a Merge branch 'dankan1890-tabbar_missing_const' into hotfix-1.4.1 2016-12-01 01:05:18 +08:00
Jinhao
a756d1dc0e Merge branch 'tabbar_missing_const' of https://github.com/dankan1890/nana into dankan1890-tabbar_missing_const 2016-12-01 01:04:36 +08:00
dankan1890
b8be0c19a7 fixed 'invisible' checks and images in listbox with cells with a custom format enabled. 2016-11-28 08:40:55 +01:00
Jinhao
b580ead080 remove useless code 2016-11-28 07:59:18 +08:00
Jinhao
8fef9916a9 fix filebox warning bug that occurs on Linux 2016-11-28 06:23:18 +08:00
dankan1890
a39013afd1 Fixed some uninitialized variables. 2016-11-27 15:38:56 +01:00
dankan1890
b50cec104f Added missing 'const' qualifier. 2016-11-27 15:16:33 +01:00
Jinhao
abe2f0687f fix some compiler warnings and errors for GCC 2016-11-27 12:39:26 +08:00
Jinhao
b23cfc8888 fix listbox bordless bug(#170) 2016-11-27 11:17:47 +08:00
Jinhao
8e8e5c4847 add contributor info 2016-11-26 06:13:18 +08:00
Jinhao
1515dc7f79 Merge branch 'dankan1890-group_hotfix-1.4.1' into hotfix-1.4.1 2016-11-26 05:45:55 +08:00
Jinhao
39b55e99ba Merge branch 'group_hotfix-1.4.1' of https://github.com/dankan1890/nana into dankan1890-group_hotfix-1.4.1 2016-11-26 05:45:40 +08:00
Jinhao
6e16115726 Merge branch 'qPCR4vir-hotfix-1.4.1' into hotfix-1.4.1 2016-11-26 05:40:51 +08:00
dankan1890
be6625b890 Disable display of field_title with an empty title. 2016-11-17 20:48:56 +01:00
qPCR4vir
06e1b7a712 test with nana-demo/hotfix 2016-11-15 03:36:01 +01:00
Jinhao
738178dec3 fix freezing of filebox when opens in other thread 2016-11-14 06:57:42 +08:00
Jinhao
0477abfafd Merge branch 'dread-uo-master' into hotfix-1.4.1 2016-11-14 05:43:18 +08:00
Jinhao
421fd3bdcd Merge branch 'master' of https://github.com/dread-uo/nana into dread-uo-master 2016-11-14 05:42:24 +08:00
Jinhao
8594d175e1 Merge branch 'toborrobot-develop' into hotfix-1.4.1 2016-11-14 05:34:45 +08:00
Rei
f42cd7b2eb Include cstring header on image_png.hpp
Compilation was failing with the "enable png" flag. This was happening
because the memcpy function was being called without the inclusion of
cstring, which declares it. This fixes it.
2016-11-05 04:46:29 -02:00
Toby Case
c2640f5524 - Include nana/deploy.hpp to declare to_utf8
- Was preventing compilation of nana library
2016-11-02 18:09:10 -07:00
Jinhao
5e6b13d23b Merge branch 'hotfix-1.4.1' into develop 2016-11-02 22:48:56 +08:00
Jinhao
a1eeeee948 fix a widget::i18n compiler error 2016-11-02 21:55:19 +08:00
Jinhao
8e228512d5 fix some i18n errors 2016-11-02 21:50:52 +08:00
Jinhao
043ebad317 fix some compiler errors and warnings 2016-10-31 06:36:03 +08:00
Jinhao
b1ce0eaff2 Merge branch 'hotfix-1.4.1' into develop 2016-10-31 06:21:41 +08:00
Jinhao
a3de89aab5 Merge branch 'PeterAddy960-hotfix-1.4' into hotfix-1.4.1 2016-10-31 06:14:10 +08:00
Jinhao
edc8304c22 Merge branch 'hotfix-1.4' of https://github.com/PeterAddy960/nana into PeterAddy960-hotfix-1.4 2016-10-31 06:13:41 +08:00
Jinhao
7ffad3c877 Merge branch 'dankan1890-features' into develop 2016-10-31 05:45:34 +08:00
Jinhao
60c35b07f6 Merge branch 'qflow-master' into hotfix-1.4.1 2016-10-31 05:42:45 +08:00
Jinhao
e6438919c0 Merge branch 'master' of https://github.com/qflow/nana into qflow-master 2016-10-31 05:42:25 +08:00
Jinhao
445f0ed6de fix issue of menu item_proxy 2016-10-31 04:33:42 +08:00
PeterAddy960
8e84383a7b Added an overload to getline to allow an offset from the beginning of the line.
Added a clear undo method.
Added an overload to selected to get the selected bounds.
2016-10-28 00:17:59 -05:00
PeterAddy960
78c3527f10 Modified the implementation so that nana:⌨️:os_del is sent throght the set_accept function, so that os_del can be blocked.
Added overload to selected to get the selection bounds.
2016-10-28 00:10:11 -05:00
PeterAddy960
ea1edb5a4a Added a clear undo method.
Added an overload to selected to get the selection bounds.
Added an overload to the getline method to allow an offset from the beginning of the line.
2016-10-28 00:07:33 -05:00
PeterAddy960
021ee1edb4 Added a clear undo method to the textbox to erase all previous undo actions.
Added an overload to the selected method that give back the bounds of the selection.
2016-10-28 00:05:56 -05:00
Jinhao
e7ce506f5a fix an exception of msg_dispatcher 2016-10-19 04:01:40 +08:00
Jinhao
9ed5e81ca2 fix the revertable lock of window_manager 2016-10-19 02:58:49 +08:00
dankan1890
afa9cffd51 Added multi platform support for ICOns files. 2016-10-18 00:32:58 +02:00
Michal Fojtak
e7181a7007 vs"15" fix 2016-10-17 15:27:38 +02:00
Jinhao
47b2234932 fix wrong pr number. 2016-10-16 07:11:40 +08:00
Jinhao
57aa0498b3 some modifications for pr(#154)
update contributor info
2016-10-16 07:07:44 +08:00
Jinhao
8f0d79b88d Merge branch 'dankan1890-features' into develop 2016-10-15 23:49:24 +08:00