Merge branch 'hotfix-1.3' into develop

This commit is contained in:
Jinhao
2016-04-18 15:16:03 +08:00
116 changed files with 2343 additions and 1004 deletions

View File

@@ -519,7 +519,7 @@ namespace nana
impl_->render();
}
void drawer::focus(graph_reference, const arg_focus& arg)
void drawer::focus(graph_reference, const arg_focus&)
{
impl_->reset_text();
impl_->render();
@@ -579,7 +579,7 @@ namespace nana
}
}
void drawer::resized(graph_reference graph, const arg_resized& arg)
void drawer::resized(graph_reference, const arg_resized&)
{
impl_->reset_text_area();
impl_->render();