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

Merge branch 'hotfix-1.5.1' into develop

Browse Source
This commit is contained in:
Jinhao
2017-06-21 22:52:47 +08:00
parent ad55c51a3e 0b4dc1904b
commit cbb42259bd
16 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/gui/widgets/listbox.cpp
View File

@@ -195,7 +195,7 @@ namespace nana
_m_refresh();
}
void width(unsigned minimum, unsigned maximum)
void width(unsigned minimum, unsigned maximum) override
{
//maximum must be larger than minimum, but maximum == 0 is allowed if minimum is 0
if ((minimum >= maximum) && (minimum != 0))
@@ -3500,7 +3500,7 @@ namespace nana
}
}
private:
void _m_draw_categ(const category_t& categ, int x, int y, int txtoff, unsigned width, const nana::rectangle& r, nana::color bgcolor, item_state state)
void _m_draw_categ(const category_t& categ, int x, int y, int txtoff, unsigned width, const nana::rectangle& /*r*/, nana::color bgcolor, item_state state)
{
const auto item_height = essence_->item_height();