Fixed some syntax errors and clang compiling warnings

GCC/VS2013/Clang is tested
This commit is contained in:
cnjinhao
2015-01-03 22:04:06 +08:00
parent 1f559964f9
commit 0a5c85d21b
14 changed files with 150 additions and 161 deletions

View File

@@ -664,7 +664,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_)
@@ -673,7 +673,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);
}