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

various fixes

Browse Source 
fixed compiler warnings
fixed bad overridings
fixed FreeBSD support
This commit is contained in:
Jinhao
2018-05-22 14:22:58 +08:00
parent 26ce77ded5
commit 216cb786e7
7 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/gui/place.cpp
View File

@@ -2583,8 +2583,9 @@ namespace nana
: public division
{
public:
div_switchable(std::string && name, implement* impl) noexcept
: division(kind::switchable, std::move(name)), impl_(impl)
div_switchable(std::string && name, implement* /*impl*/) noexcept:
division(kind::switchable, std::move(name))//,
//impl_(impl) //deprecated
{}
private:
void collocate(window wd) override
@@ -2613,7 +2614,7 @@ namespace nana
}
}
private:
implement * const impl_;
//implement * const impl_; //deprecated
};
place::implement::~implement()

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

@@ -817,7 +817,7 @@ namespace drawerbase {
editor->reset_caret_pixels();
}
std::shared_ptr<scroll_operation_interface> textbox::_m_scroll_operation() const
std::shared_ptr<scroll_operation_interface> textbox::_m_scroll_operation()
{
internal_scope_guard lock;
auto editor = get_drawer_trigger().editor();

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

@@ -2234,7 +2234,7 @@ namespace nana
return item_proxy(const_cast<drawer_trigger_t*>(&get_drawer_trigger()), get_drawer_trigger().selected());
}
std::shared_ptr<scroll_operation_interface> treebox::_m_scroll_operation() const
std::shared_ptr<scroll_operation_interface> treebox::_m_scroll_operation()
{
internal_scope_guard lock;
return std::make_shared<drawerbase::treebox::exclusive_scroll_operation>(get_drawer_trigger().impl()->shape.scroll);