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

fix compiler errors/warnings for clang 5.0

Browse Source
This commit is contained in:
Jinhao
2017-06-11 11:33:52 +08:00
parent bd38e96ed7
commit 0b4dc1904b
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))
@@ -3531,7 +3531,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();

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

@@ -85,7 +85,7 @@ namespace nana
//class item_renderer
item_renderer::item_renderer(window wd, graph_reference graph)
:handle_(wd), graph_(graph), scheme_ptr_(static_cast<scheme*>(API::dev::get_scheme(wd)))
:graph_(graph), scheme_ptr_(static_cast<scheme*>(API::dev::get_scheme(wd)))
{}
void item_renderer::background(const nana::point& pos, const nana::size& size, state item_state)

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

@@ -440,7 +440,7 @@ namespace nana{ namespace widgets
);
}
bool clear()
bool clear() override
{
if (colored_areas_.empty())
return false;

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

@@ -2200,7 +2200,7 @@ namespace nana
}
path.insert(0, pnode->value.first);
return std::move(path);
return path;
}
return{};
}