diff --git a/CMakeLists.txt b/CMakeLists.txt index 1fbeb363..1d023469 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,7 +142,11 @@ endif() # if(CMAKE_COMPILER_IS_GNUCXX OR "${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() set(CMAKE_CXX_FLAGS "-std=c++14 -Wall") endif() diff --git a/include/nana/gui/widgets/listbox.hpp b/include/nana/gui/widgets/listbox.hpp index 3f2caab6..1fe6aeca 100644 --- a/include/nana/gui/widgets/listbox.hpp +++ b/include/nana/gui/widgets/listbox.hpp @@ -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, bool create_if_not_exists); void _m_erase_key(nana::detail::key_interface*) noexcept; - std::shared_ptr _m_scroll_operation(); + std::shared_ptr _m_scroll_operation() override; }; }//end namespace nana diff --git a/include/nana/gui/widgets/textbox.hpp b/include/nana/gui/widgets/textbox.hpp index de70728c..4a2663ae 100644 --- a/include/nana/gui/widgets/textbox.hpp +++ b/include/nana/gui/widgets/textbox.hpp @@ -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 _m_scroll_operation() const; + std::shared_ptr _m_scroll_operation() override; }; }//end namespace nana #include diff --git a/include/nana/gui/widgets/treebox.hpp b/include/nana/gui/widgets/treebox.hpp index 75be5da0..671851c2 100644 --- a/include/nana/gui/widgets/treebox.hpp +++ b/include/nana/gui/widgets/treebox.hpp @@ -446,7 +446,7 @@ namespace nana item_proxy selected() const; ///< returns the selected node private: - std::shared_ptr _m_scroll_operation() const; + std::shared_ptr _m_scroll_operation() override; };//end class treebox }//end namespace nana diff --git a/source/gui/place.cpp b/source/gui/place.cpp index f8fb949a..5a9982c6 100644 --- a/source/gui/place.cpp +++ b/source/gui/place.cpp @@ -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() diff --git a/source/gui/widgets/textbox.cpp b/source/gui/widgets/textbox.cpp index 265a8e28..2fbc9290 100644 --- a/source/gui/widgets/textbox.cpp +++ b/source/gui/widgets/textbox.cpp @@ -817,7 +817,7 @@ namespace drawerbase { editor->reset_caret_pixels(); } - std::shared_ptr textbox::_m_scroll_operation() const + std::shared_ptr textbox::_m_scroll_operation() { internal_scope_guard lock; auto editor = get_drawer_trigger().editor(); diff --git a/source/gui/widgets/treebox.cpp b/source/gui/widgets/treebox.cpp index 4dcf0d57..19873e27 100644 --- a/source/gui/widgets/treebox.cpp +++ b/source/gui/widgets/treebox.cpp @@ -2234,7 +2234,7 @@ namespace nana return item_proxy(const_cast(&get_drawer_trigger()), get_drawer_trigger().selected()); } - std::shared_ptr treebox::_m_scroll_operation() const + std::shared_ptr treebox::_m_scroll_operation() { internal_scope_guard lock; return std::make_shared(get_drawer_trigger().impl()->shape.scroll);