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

Merge branch 'hotfix-1.5.1' into develop

Browse Source
This commit is contained in:
Jinhao
2017-06-21 22:52:47 +08:00
parent ad55c51a3e 0b4dc1904b
commit cbb42259bd
16 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/nana/c++defines.hpp
View File

@@ -62,7 +62,7 @@
# else
# undef STD_FILESYSTEM_NOT_SUPPORTED
# endif
#elif defined(__GNUC__)
#elif defined(__GNUC__) && not defined(__clang__)
# if (__GNUC__ == 4 && __GNUC_MINOR__ < 6)
# define noexcept //no support of noexcept until GCC 4.6
# endif

2
include/nana/gui/detail/basic_window.hpp
View File

@@ -52,7 +52,7 @@ namespace detail
void position(const point& pos) override;
nana::point position() const override;
size dimension() const override;
void dimension(const size& s);
void dimension(const size& s) override;
void visible(bool visibility) override;
bool visible() const override;
private:

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

@@ -419,7 +419,7 @@ namespace nana
throw std::runtime_error("nana::listbox disallow to remove items because of immutable model");
}
void erase(std::size_t pos) override
void erase(std::size_t /*pos*/) override
{
throw std::runtime_error("nana::listbox disallow to remove items because of immutable model");
}
@@ -434,7 +434,7 @@ namespace nana
return true;
}
void emplace(std::size_t pos) override
void emplace(std::size_t /*pos*/) override
{
throw std::runtime_error("nana::listbox disallow to remove items because of immutable model");
}
@@ -444,7 +444,7 @@ namespace nana
throw std::runtime_error("nana::listbox disallow to remove items because of immutable model");
}
void assign(std::size_t pos, const std::vector<cell>& cells) override
void assign(std::size_t /*pos*/, const std::vector<cell>& /*cells*/) override
{
throw std::runtime_error("nana::listbox disallow to remove items because of immutable model");
}
@@ -454,7 +454,7 @@ namespace nana
return ctrans_(container_.at(pos));
}
bool push_back(const const_virtual_pointer& dptr) override
bool push_back(const const_virtual_pointer& /*dptr*/) override
{
throw std::runtime_error("nana::listbox disallow to remove items because of immutable model");
}

1
include/nana/gui/widgets/menubar.hpp
View File

@@ -50,7 +50,6 @@ namespace nana
virtual void caption(const point&, const native_string_type&);
scheme *scheme_ptr() const { return scheme_ptr_; };
private:
window handle_;
graph_reference graph_;
scheme *scheme_ptr_;
};