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

small changes for end index of checkbox

Browse Source
This commit is contained in:
Jinhao 2018-04-09 13:55:00 +08:00
parent 355b6b2520
commit 2ba32d8aca
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/nana/gui/widgets/checkbox.hpp
View File

@ -1,7 +1,7 @@
/** /**
* A CheckBox Implementation * A CheckBox Implementation
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2016 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2018 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
@ -100,6 +100,7 @@ namespace drawerbase
event_handle eh_keyboard; event_handle eh_keyboard;
}; };
public: public:
constexpr static const std::size_t npos = static_cast<std::size_t>(-1);
~radio_group(); ~radio_group();
void add(checkbox&); void add(checkbox&);
std::size_t checked() const; ///< Retrieves the index of the checkbox which is checked. std::size_t checked() const; ///< Retrieves the index of the checkbox which is checked.

7
include/nana/gui/widgets/group.hpp
View File

@ -1,7 +1,7 @@
/** /**
* A group widget implementation * A group widget implementation
* Nana C++ Library(http://www.nanaro.org) * Nana C++ Library(http://www.nanaro.org)
* Copyright(C) 2015 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2015-2018 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
@ -28,6 +28,7 @@ namespace nana{
struct implement; struct implement;
public: public:
using field_reference = place::field_reference; using field_reference = place::field_reference;
constexpr static const std::size_t npos = static_cast<std::size_t>(-1);
/// The default construction /// The default construction
group(); group();
@ -63,8 +64,8 @@ namespace nana{
group& enable_format_caption(bool format); group& enable_format_caption(bool format);
group& collocate() throw(); group& collocate() noexcept;
group& div(const char* div_str) throw(); group& div(const char* div_str) noexcept;
field_reference operator[](const char* field); field_reference operator[](const char* field);
template<typename Widget, typename ...Args> template<typename Widget, typename ...Args>

4
source/gui/widgets/checkbox.cpp
View File

@ -1,7 +1,7 @@
/* /*
* A CheckBox Implementation * A CheckBox Implementation
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2017 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2018 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
@ -296,7 +296,7 @@ namespace nana{ namespace drawerbase
return static_cast<std::size_t>(i - ui_container_.cbegin()); return static_cast<std::size_t>(i - ui_container_.cbegin());
} }
return ui_container_.size(); return npos;
} }
std::size_t radio_group::size() const std::size_t radio_group::size() const

6
source/gui/widgets/group.cpp
View File

@ -1,7 +1,7 @@
/** /**
* A group widget implementation * A group widget implementation
* Nana C++ Library(http://www.nanaro.org) * Nana C++ Library(http://www.nanaro.org)
* Copyright(C) 2015-2017 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2015-2018 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
@ -172,13 +172,13 @@ namespace nana{
return *this; return *this;
} }
group& group::collocate() throw () group& group::collocate() noexcept
{ {
impl_->place_content.collocate(); impl_->place_content.collocate();
return *this; return *this;
} }
group& group::div(const char* div_str) throw () group& group::div(const char* div_str) noexcept
{ {
if (div_str) if (div_str)
impl_->usr_div_str = div_str; impl_->usr_div_str = div_str;