109 Commits

Author SHA1 Message Date
Jinhao
d521e9829b Merge branch 'develop' of https://github.com/qqiangwu/nana into qqiangwu-develop
Conflicts:
	include/nana/deploy.hpp
	source/deploy.cpp
2015-04-13 00:38:08 +08:00
Jinhao
6ba23bb6c3 add header_width() methods for getting/setting header width. 2015-04-12 23:28:48 +08:00
Jinhao
e84b5ff78a code reviews 2015-04-12 23:26:27 +08:00
qqiangwu
100283d43e minor fix 2015-04-12 12:05:59 +08:00
qqiangwu
79ec3c927d eliminate macro redefine error when used in biicode 2015-04-12 11:40:58 +08:00
qqiangwu
9c3f53eab8 modify readme and fix(maybe?) the curious thread support problem 2015-04-12 00:59:49 +08:00
Jinhao
4e741c7ebb minor changes 2015-04-10 01:18:32 +08:00
Jinhao
71d79d8dde Merge branch 'qqiangwu-develop' into develop 2015-04-10 00:57:41 +08:00
qqiangwu
86d675fa85 fix mingw compilation error 2015-04-05 22:07:57 +08:00
Jinhao
e3a82e99c0 Merge branch 'kirbyfan64-develop' into develop 2015-03-24 12:32:07 +08:00
Ryan Gonzalez
6a5c45e372 Add back original makefiles and tweak bakefile 2015-03-22 16:56:52 -05:00
Ryan Gonzalez
c14fd897f9 Merge branch 'develop' of https://github.com/cnjinhao/nana into develop 2015-03-17 13:42:24 -05:00
Jinhao
a8573fe5ef remove physical dependency between msgbox and filebox 2015-03-11 03:45:22 +08:00
Jinhao
0df28e13e1 minor revision 2015-03-01 22:40:16 +08:00
Jinhao
57bd96a6ca Merge branch 'hotfixes-1.0' into develop 2015-03-01 22:16:17 +08:00
Ryan Gonzalez
8cb7bd0027 Use Bakefile for makefiles 2015-02-28 18:41:56 -06:00
Jinhao
22a75669c3 Merge branch 'kirbyfan64-develop' into develop 2015-02-28 00:40:28 +08:00
Ryan Gonzalez
42af001020 Fix Linux builds 2015-02-26 19:00:03 -06:00
Jinhao
9fbe14e2de code reviews 2015-02-26 02:35:19 +08:00
Jinhao
d3d46705f3 stop intercepting the WM_SYSCHAR keys 2015-02-26 00:37:49 +08:00
Jinhao
e721cfa51f support of unimplemented std::regex 2015-02-25 22:15:02 +08:00
Jinhao
0d8daca12f fix intercept of system key to respone Alt+F4 2015-02-25 18:18:33 +08:00
Jinhao
aa179dbfd9 fix slider knob precision issue 2015-02-25 17:18:13 +08:00
Jinhao
c2cb89f024 improve inputbox
fix some inputbox issues
add a new inputbox::path class
2015-02-25 01:00:27 +08:00
Jinhao
f454a965be improve inputbox 2015-02-24 17:03:17 +08:00
Jinhao
022f7168c0 improve picture widget stretchable mode 2015-02-23 18:05:18 +08:00
Jinhao
d7a0d6f7d3 support of display images in inputbox 2015-02-23 01:45:00 +08:00
Jinhao
723dea218d improve nana::picture 2015-02-23 01:43:23 +08:00
Jinhao
baa8f4a9e9 fixed an integer overflow issue 2015-02-23 01:23:34 +08:00
Jinhao
ced13132a4 Merge branch 'roberthauck-master' into hotfixes-1.0 2015-02-17 23:46:12 +08:00
Jinhao
8eec17b227 Merge branch 'master' of https://github.com/roberthauck/nana into roberthauck-master 2015-02-17 23:45:45 +08:00
Jinhao
ef705bbb5a add tip string and mask character for inputbox::text 2015-02-17 23:14:39 +08:00
Robert Hauck
b755c24804 - Disable annoying VS warnings
- Option to enable multiprocessor build on VS
- Move all options to CMake:
   - Unicode
   - Platform specs
2015-02-17 10:47:49 +01:00
Jinhao
0ffa3e54ca some improvements 2015-02-17 04:03:55 +08:00
Jinhao
4385ac623d add fps modifier for animation 2015-02-16 06:59:56 +08:00
cnjinhao
c417f15b03 add contributor information 2015-02-12 02:45:16 +08:00
cnjinhao
eef7ed27ad Merge branch 'roberthauck-master' into hotfixes-1.0 2015-02-12 02:42:24 +08:00
Robert Hauck
0fa61b0c95 make libpng only selectable when using png 2015-02-11 14:02:55 +01:00
Robert Hauck
0464e8e5d7 missing include 2015-02-11 13:57:48 +01:00
Robert Hauck
68caee5c2b fix for linux build (Fedora 21) 2015-02-11 13:48:59 +01:00
Robert Hauck
5afe02cdd4 wrong defines 2015-02-11 13:32:27 +01:00
Robert Hauck
73a5352796 fix for libpng 2015-02-11 13:23:01 +01:00
cnjinhao
710ffb29ff Merge branch 'develop' 2015-02-08 07:14:51 +08:00
cnjinhao
274155b1da improve the spinbox and inputbox
improve the input check for spinbox
add a verifier to check user input for inputbox
2015-02-07 11:47:45 +08:00
cnjinhao
e0a9a94a8b fix clang compiling errors 2015-02-06 07:23:17 +08:00
cnjinhao
81a50fd84f Add support CSS color text for class nana::color 2015-02-06 01:45:17 +08:00
cnjinhao
fd5ff571a7 get ready for Linux 2015-02-04 10:26:08 +08:00
cnjinhao
ec78324743 Merge branch 'ierofant-develop' into develop 2015-02-04 01:37:01 +08:00
cnjinhao
38552b855b make all internal event handlers unignorable 2015-02-04 01:34:50 +08:00
cnjinhao
91f88bf6d4 add author info for cmake configuration 2015-02-04 01:21:16 +08:00