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

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

@@ -1541,7 +1541,7 @@ the nana::detail::basic_window member pointer scheme
nana::any* _m_anyobj(size_type cat, size_type index, bool allocate_if_empty) const override;
drawerbase::listbox::category_t* _m_assoc(std::shared_ptr<nana::detail::key_interface>, bool create_if_not_exists);
void _m_erase_key(nana::detail::key_interface*) noexcept;
std::shared_ptr<scroll_operation_interface> _m_scroll_operation();
std::shared_ptr<scroll_operation_interface> _m_scroll_operation() override;
};
}//end namespace nana

2
include/nana/gui/widgets/textbox.hpp
View File

@@ -279,7 +279,7 @@ namespace nana
native_string_type _m_caption() const throw() override;
void _m_caption(native_string_type&&) override;
void _m_typeface(const paint::font&) override;
std::shared_ptr<scroll_operation_interface> _m_scroll_operation() const;
std::shared_ptr<scroll_operation_interface> _m_scroll_operation() override;
};
}//end namespace nana
#include <nana/pop_ignore_diagnostic>

2
include/nana/gui/widgets/treebox.hpp
View File

@@ -446,7 +446,7 @@ namespace nana
item_proxy selected() const; ///< returns the selected node
private:
std::shared_ptr<scroll_operation_interface> _m_scroll_operation() const;
std::shared_ptr<scroll_operation_interface> _m_scroll_operation() override;
};//end class treebox
}//end namespace nana