28 Commits

Author SHA1 Message Date
Jinhao
17556cae99 Merge branch 'feature-group' into develop
Conflicts:
	build/vc2013/nana.vcxproj
	build/vc2013/nana.vcxproj.filters
2015-07-12 11:31:06 +08:00
Jinhao
feed286b53 Merge branch 'VC2015_RC' of https://github.com/qPCR4vir/nana into qPCR4vir-VC2015_RC
Conflicts:
	include/nana/config.hpp
2015-06-10 07:26:41 +08:00
qPCR4vir
b1db4b2e14 project for VS2015 2015-05-28 01:55:46 +02:00
qPCR4vir
80aed9c94b nana filesystem need vc2015 2015-05-28 01:55:24 +02:00
qPCR4vir
b37ecda187 fix more warning 2015-05-28 01:54:07 +02:00
qPCR4vir
ae1d01814a FIX: linker warning which eventually produce errors 2015-05-28 01:52:38 +02:00
qPCR4vir
02961f1673 add file_type (from type), bring all from fs_utility and mimic path, and directory_entry 2015-05-28 01:43:28 +02:00
qPCR4vir
7117cc03b0 adapting nana filesystem to std 2015-05-28 01:42:39 +02:00
Jinhao
a4c3ee5b57 Merge branch 'group' of https://github.com/qPCR4vir/nana into qPCR4vir-group 2015-05-04 04:59:50 +08:00
Jinhao
08e860a7e7 Merge branch 'hotfixes-1.0.1' into develop
Conflicts:
	.gitignore
	include/nana/deploy.hpp
	source/deploy.cpp
	source/gui/widgets/listbox.cpp
2015-05-03 03:08:26 +08:00
qPCR4vir
d13677f703 add empty group files 2015-04-26 00:30:03 +02:00
Jinhao
4e741c7ebb minor changes 2015-04-10 01:18:32 +08:00
beru
551fa896e7 fixed line encoding 2015-04-05 19:57:40 +09:00
beru
76a2324b55 enable MultiProcessorCompilation to decrease build time 2015-04-05 19:37:20 +09: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
qPCR4vir
24675db26b static link runtime 2015-03-09 12:02:12 +01:00
qPCR4vir
5b989435f2 add x64 and OutputFile name: $(OutDir)\nana_$(ConfigurationName)_$(PlatformShortName).lib 2015-03-05 00:38:29 +01:00
Ryan Gonzalez
8cb7bd0027 Use Bakefile for makefiles 2015-02-28 18:41:56 -06: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
Robert Hauck
73a5352796 fix for libpng 2015-02-11 13:23:01 +01:00
cnjinhao
91f88bf6d4 add author info for cmake configuration 2015-02-04 01:21:16 +08:00
Andrew Kornilov
49fb74cdd1 Add CMake configuration 2015-02-03 00:59:28 +03:00
cnjinhao
4ff3a6afd5 Add the new spinbox widget 2015-01-22 06:19:24 +08:00
cnjinhao
0474299bdc Fixed some MinGW warnings 2015-01-12 05:27:11 +08:00
cnjinhao
b827e0aa82 multiple display monitors support
Added a new class screen
2015-01-02 13:25:46 +08:00
cnjinhao
ecbf71b7e2 Color Schemes
textbox.scheme().selection = color(colors::red);
Set the text selection background color
2014-12-28 17:16:52 +08:00
cnjinhao
d0a317bd45 first init of 0.9 2014-12-11 03:32:35 +08:00