mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'hotfixes-0.9.1' into develop

Browse Source 
Conflicts:
	include/nana/gui/widgets/progress.hpp
	source/gui/widgets/date_chooser.cpp
	source/gui/widgets/progress.cpp
	source/gui/widgets/treebox.cpp
This commit is contained in:
cnjinhao
2015-02-02 18:55:23 +08:00
parent 0dc50058cb a3db9cb5d6
commit 04afbe9df9
15 changed files with 201 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/gui/widgets/date_chooser.cpp
View File

@@ -53,7 +53,7 @@ namespace nana
void trigger::week_name(unsigned index, const nana::string& str)
{
if(0 <= index && index < 7)
if(index < 7)
this->weekstr_[index] = str;
}