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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -142,7 +142,11 @@ endif()
# #
if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_CXX_FLAGS "-std=gnu++14 -Wall") if("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
set(CMAKE_CXX_FLAGS "-std=gnu++14 -Wall -I/usr/local/include")
else()
set(CMAKE_CXX_FLAGS "-std=gnu++14 -Wall")
endif()
else() else()
set(CMAKE_CXX_FLAGS "-std=c++14 -Wall") set(CMAKE_CXX_FLAGS "-std=c++14 -Wall")
endif() endif()

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; 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); 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; 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 }//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; native_string_type _m_caption() const throw() override;
void _m_caption(native_string_type&&) override; void _m_caption(native_string_type&&) override;
void _m_typeface(const paint::font&) 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 }//end namespace nana
#include <nana/pop_ignore_diagnostic> #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 item_proxy selected() const; ///< returns the selected node
private: 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 class treebox
}//end namespace nana }//end namespace nana

7
source/gui/place.cpp
View File

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

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

@ -817,7 +817,7 @@ namespace drawerbase {
editor->reset_caret_pixels(); 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; internal_scope_guard lock;
auto editor = get_drawer_trigger().editor(); 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()); 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; internal_scope_guard lock;
return std::make_shared<drawerbase::treebox::exclusive_scroll_operation>(get_drawer_trigger().impl()->shape.scroll); return std::make_shared<drawerbase::treebox::exclusive_scroll_operation>(get_drawer_trigger().impl()->shape.scroll);