From 24c1b292cc931a319634ed10d22865803f86271e Mon Sep 17 00:00:00 2001 From: Jinhao Date: Fri, 24 Mar 2017 06:37:38 +0800 Subject: [PATCH] fix compiler errors and warning --- source/gui/widgets/treebox.cpp | 3 +-- source/paint/detail/image_ico.hpp | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/gui/widgets/treebox.cpp b/source/gui/widgets/treebox.cpp index 350a4210..e62e728f 100644 --- a/source/gui/widgets/treebox.cpp +++ b/source/gui/widgets/treebox.cpp @@ -611,7 +611,7 @@ namespace nana { scroll.create(*data.widget_ptr, nana::rectangle(data.graph->width() - 16, 0, 16, data.graph->height())); - scroll.events().value_changed.connect_unignorable([this](const arg_scroll& arg) + scroll.events().value_changed.connect_unignorable([this](const arg_scroll&) { adjust.scroll_timestamp = nana::system::timestamp(); adjust.timer.start(); @@ -1791,7 +1791,6 @@ namespace nana if (!node) return; - auto & node_state = impl_->node_state; switch (nl.what()) { case component::icon: diff --git a/source/paint/detail/image_ico.hpp b/source/paint/detail/image_ico.hpp index 3a437b34..2caa07f3 100644 --- a/source/paint/detail/image_ico.hpp +++ b/source/paint/detail/image_ico.hpp @@ -269,7 +269,9 @@ public: { if (_m_read_ico(data, bytes)) { +#if defined(NANA_WINDOWS) native_handle_ = ::CreateIconFromResourceEx(reinterpret_cast(const_cast(data)), static_cast(bytes), TRUE, 0x00030000, 0, 0, LR_DEFAULTCOLOR); +#endif return true; } return false;