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

fix compiler errors and warning

Browse Source
This commit is contained in:
Jinhao 2017-03-24 06:37:38 +08:00
parent b1fe1ca412
commit 24c1b292cc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -611,7 +611,7 @@ namespace nana
{ {
scroll.create(*data.widget_ptr, nana::rectangle(data.graph->width() - 16, 0, 16, data.graph->height())); 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.scroll_timestamp = nana::system::timestamp();
adjust.timer.start(); adjust.timer.start();
@ -1791,7 +1791,6 @@ namespace nana
if (!node) if (!node)
return; return;
auto & node_state = impl_->node_state;
switch (nl.what()) switch (nl.what())
{ {
case component::icon: case component::icon:

2
source/paint/detail/image_ico.hpp
View File

@ -269,7 +269,9 @@ public:
{ {
if (_m_read_ico(data, bytes)) if (_m_read_ico(data, bytes))
{ {
#if defined(NANA_WINDOWS)
native_handle_ = ::CreateIconFromResourceEx(reinterpret_cast<PBYTE>(const_cast<void*>(data)), static_cast<DWORD>(bytes), TRUE, 0x00030000, 0, 0, LR_DEFAULTCOLOR); native_handle_ = ::CreateIconFromResourceEx(reinterpret_cast<PBYTE>(const_cast<void*>(data)), static_cast<DWORD>(bytes), TRUE, 0x00030000, 0, 0, LR_DEFAULTCOLOR);
#endif
return true; return true;
} }
return false; return false;