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

small fixes

Browse Source
This commit is contained in:
Jinhao 2017-06-21 22:42:22 +08:00
parent 74dedb9506
commit ad55c51a3e
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/makefile/makefile
View File

@ -8,7 +8,6 @@ SRCROOT = ../../source
EXTRLIB = ../../extrlib EXTRLIB = ../../extrlib
NANA_INC= $(INCROOT)/nana NANA_INC= $(INCROOT)/nana
OUTROOT = out OUTROOT = out
#CXXFLAGS= -g -std=c++11 -Wall
CXXFLAGS= -g -fexceptions -std=c++11 -Wall -Wextra -Wunused-variable -Wfatal-errors CXXFLAGS= -g -fexceptions -std=c++11 -Wall -Wextra -Wunused-variable -Wfatal-errors
INCS = -I$(INCROOT) -I/usr/include/freetype2 -I$(EXTRLIB) INCS = -I$(INCROOT) -I/usr/include/freetype2 -I$(EXTRLIB)

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

@ -186,7 +186,7 @@ namespace nana
public: public:
virtual ~container_interface() = default; virtual ~container_interface() = default;
virtual void clear() noexcept = 0; virtual void clear() = 0;
virtual void erase(std::size_t pos) = 0; virtual void erase(std::size_t pos) = 0;
virtual std::size_t size() const = 0; virtual std::size_t size() const = 0;
@ -238,7 +238,7 @@ namespace nana
translator_({ vtrans, ctrans }) translator_({ vtrans, ctrans })
{} {}
private: private:
void clear() noexcept override void clear() override
{ {
container_.clear(); container_.clear();
} }
@ -246,7 +246,7 @@ namespace nana
void erase(std::size_t pos) override void erase(std::size_t pos) override
{ {
auto i = container_.begin(); auto i = container_.begin();
std::advance(i, static_cast<int>(pos)); std::advance(i, pos);
container_.erase(i); container_.erase(i);
} }
@ -263,7 +263,7 @@ namespace nana
void emplace(std::size_t pos) override void emplace(std::size_t pos) override
{ {
auto i = container_.begin(); auto i = container_.begin();
std::advance(i, static_cast<int>(pos)); std::advance(i, pos);
container_.emplace(i); container_.emplace(i);
} }
@ -327,7 +327,7 @@ namespace nana
} }
private: private:
void clear() noexcept override void clear() override
{ {
container_.clear(); container_.clear();
} }
@ -335,7 +335,7 @@ namespace nana
void erase(std::size_t pos) override void erase(std::size_t pos) override
{ {
auto i = container_.begin(); auto i = container_.begin();
std::advance(i, static_cast<int>(pos)); std::advance(i, pos);
container_.erase(i); container_.erase(i);
} }
@ -352,7 +352,7 @@ namespace nana
void emplace(std::size_t pos) override void emplace(std::size_t pos) override
{ {
auto i = container_.begin(); auto i = container_.begin();
std::advance(i, static_cast<int>(pos)); std::advance(i, pos);
container_.emplace(i); container_.emplace(i);
} }