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

4
source/gui/widgets/skeletons/text_editor.cpp
View File

@@ -643,7 +643,7 @@ namespace nana{ namespace widgets
pre_calc_line(i, pixels);
}
std::size_t take_lines() const
std::size_t take_lines() const override
{
std::size_t lines = 0;
for (auto & mtr : linemtr_)
@@ -652,7 +652,7 @@ namespace nana{ namespace widgets
return lines;
}
std::size_t take_lines(std::size_t pos) const
std::size_t take_lines(std::size_t pos) const override
{
return (pos < linemtr_.size() ? linemtr_[pos].take_lines : 0);
}