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

small fixes

Browse Source
This commit is contained in:
Jinhao 2017-04-29 01:48:13 +08:00
parent 9548b87f54
commit 2c318e2d33
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nana/gui/widgets/listbox.hpp
View File

@ -1176,8 +1176,8 @@ namespace nana
color_proxy header_fgcolor{ colors::black }; color_proxy header_fgcolor{ colors::black };
color_proxy header_grabbed{ static_cast<color_rgb>(0x8BD6F6)}; color_proxy header_grabbed{ static_cast<color_rgb>(0x8BD6F6)};
color_proxy header_floated{ static_cast<color_rgb>(0xBABBBC)}; color_proxy header_floated{ static_cast<color_rgb>(0xBABBBC)};
color_proxy item_selected{ static_cast<color_rgb>(0xD5EFFC) }; color_proxy item_selected{ static_cast<color_rgb>(0xCCE8FF) };
color_proxy item_highlighted{ static_cast<color_rgb>(0xD5EFFC) }; color_proxy item_highlighted{ static_cast<color_rgb>(0xE5F3FF) };
color_proxy selection_box{ static_cast<color_rgb>(0x3399FF) }; ///< Color of selection box border. color_proxy selection_box{ static_cast<color_rgb>(0x3399FF) }; ///< Color of selection box border.

9
include/nana/gui/widgets/widget.hpp
View File

@ -245,9 +245,8 @@ namespace nana
void _m_notify_destroy() override final void _m_notify_destroy() override final
{ {
events_ = std::make_shared<Events>();
API::dev::set_events(handle_, events_);
widget_base::_m_notify_destroy(); widget_base::_m_notify_destroy();
events_ = std::make_shared<Events>();
} }
private: private:
DrawerTrigger trigger_; DrawerTrigger trigger_;
@ -310,9 +309,8 @@ namespace nana
void _m_notify_destroy() override final void _m_notify_destroy() override final
{ {
events_ = std::make_shared<Events>();
API::dev::set_events(handle_, events_);
widget_base::_m_notify_destroy(); widget_base::_m_notify_destroy();
events_ = std::make_shared<Events>();
} }
private: private:
std::shared_ptr<Events> events_; std::shared_ptr<Events> events_;
@ -449,9 +447,8 @@ namespace nana
void _m_notify_destroy() override final void _m_notify_destroy() override final
{ {
events_ = std::make_shared<Events>();
API::dev::set_events(handle_, events_);
widget_base::_m_notify_destroy(); widget_base::_m_notify_destroy();
events_ = std::make_shared<Events>();
} }
private: private:
DrawerTrigger trigger_; DrawerTrigger trigger_;