Merge branch 'hotfix-1.5.1' into develop

source/gui/animation.cpp

@@ -454,7 +454,7 @@ namespace nana
 				thr->performance_parameter = 0.0;
 				thr->fps = p->fps;
 				thr->interval = 1000.0 / double(p->fps);
-				thr->thread = std::make_shared<std::thread>([this, thr]()
+				thr->thread = std::make_shared<std::thread>([thr]()
 				{
 					nana::system::timepiece tmpiece;
 					while (true)

source/gui/filebox.cpp

@@ -270,7 +270,7 @@ namespace nana
 
 					return (reverse ? a > b : a < b);
 				});
-			ls_file_.set_sort_compare(3, [this](const std::string&, nana::any* anyptr_a, const std::string&, nana::any* anyptr_b, bool reverse) -> bool
+			ls_file_.set_sort_compare(3, [](const std::string&, nana::any* anyptr_a, const std::string&, nana::any* anyptr_b, bool reverse) -> bool
 				{
 					item_fs * fsa = any_cast<item_fs>(anyptr_a);
 					item_fs * fsb = any_cast<item_fs>(anyptr_b);

source/gui/notifier.cpp

@@ -265,6 +265,9 @@ namespace nana
 
 			auto ico = impl_->icons[impl_->play_index++];
 			impl_->set_icon(ico);
+#else
+			//eliminates warnings in clang
+			static_cast<void>(this);
 #endif
 		});
 

source/gui/place_parts.hpp

@@ -68,13 +68,13 @@ namespace nana
 				API::dev::lazy_refresh();
 			}
 
-			void mouse_down(graph_reference graph, const arg_mouse&)
+			void mouse_down(graph_reference graph, const arg_mouse&) override
 			{
 				refresh(graph);
 				API::dev::lazy_refresh();
 			}
 
-			void mouse_up(graph_reference graph, const arg_mouse&)
+			void mouse_up(graph_reference graph, const arg_mouse&) override
 			{
 				refresh(graph);
 				API::dev::lazy_refresh();

source/gui/widgets/listbox.cpp

@@ -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();
 

source/gui/widgets/menubar.cpp

@@ -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)

source/gui/widgets/skeletons/text_editor.cpp

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

source/gui/widgets/treebox.cpp

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