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

code reviews

Browse Source
This commit is contained in:
Jinhao
2015-02-26 02:35:19 +08:00
parent e721cfa51f
commit 9fbe14e2de
10 changed files with 329 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,7 +133,7 @@ namespace nana
str = ::nana::internationalization()(monthstr[chmonth_.month - 1]);
str += STR(" ");
}
str += ::nana::to_wstring(chmonth_.year);
str += std::to_wstring(chmonth_.year);
nana::size txt_s = graph.text_extent_size(str);
@@ -203,7 +203,7 @@ namespace nana
void trigger::_m_draw_pos(drawing_basis & dbasis, graph_reference graph, int x, int y, int number, bool primary, bool sel)
{
_m_draw_pos(dbasis, graph, x, y, ::nana::to_wstring(number), primary, sel);
_m_draw_pos(dbasis, graph, x, y, std::to_wstring(number), primary, sel);
}
void trigger::_m_draw_ex_days(drawing_basis & dbasis, graph_reference graph, int begx, int begy, bool before)

102
source/gui/widgets/listbox.cpp
View File

@@ -18,7 +18,6 @@
#include <list>
#include <deque>
#include <stdexcept>
#include <sstream>
#include <algorithm>
namespace nana
@@ -87,66 +86,66 @@ namespace nana
}
oresolver& oresolver::operator<<(short n)
{
cells_.emplace_back(::nana::to_wstring(n));
cells_.emplace_back(std::to_wstring(n));
return *this;
}
oresolver& oresolver::operator<<(unsigned short n)
{
cells_.emplace_back(::nana::to_wstring(n));
cells_.emplace_back(std::to_wstring(n));
return *this;
}
oresolver& oresolver::operator<<(int n)
{
cells_.emplace_back(::nana::to_wstring(n));
cells_.emplace_back(std::to_wstring(n));
return *this;
}
oresolver& oresolver::operator<<(unsigned int n)
{
cells_.emplace_back(::nana::to_wstring(n));
cells_.emplace_back(std::to_wstring(n));
return *this;
}
oresolver& oresolver::operator<<(long n)
{
cells_.emplace_back(::nana::to_wstring(n));
cells_.emplace_back(std::to_wstring(n));
return *this;
}
oresolver& oresolver::operator<<(unsigned long n)
{
cells_.emplace_back(::nana::to_wstring(n));
cells_.emplace_back(std::to_wstring(n));
return *this;
}
oresolver& oresolver::operator<<(long long n)
{
cells_.emplace_back(::nana::to_wstring(n));
cells_.emplace_back(std::to_wstring(n));
return *this;
}
oresolver& oresolver::operator<<(unsigned long long n)
{
cells_.emplace_back(::nana::to_wstring(n));
cells_.emplace_back(std::to_wstring(n));
return *this;
}
oresolver& oresolver::operator<<(float f)
{
cells_.emplace_back(::nana::to_wstring(f));
cells_.emplace_back(std::to_wstring(f));
return *this;
}
oresolver& oresolver::operator<<(double f)
{
cells_.emplace_back(::nana::to_wstring(f));
cells_.emplace_back(std::to_wstring(f));
return *this;
}
oresolver& oresolver::operator<<(long double f)
{
cells_.emplace_back(::nana::to_wstring(f));
cells_.emplace_back(std::to_wstring(f));
return *this;
}
@@ -201,117 +200,82 @@ namespace nana
iresolver& iresolver::operator>>(bool& n)
{
if (pos_ < cells_.size())
{
std::wstringstream ss(cells_[pos_++].text);
ss >> n;
}
n = (std::stoi(cells_[pos_++].text) == 0);
return *this;
}
iresolver& iresolver::operator>>(short& n)
{
if (pos_ < cells_.size())
{
std::wstringstream ss(cells_[pos_++].text);
ss >> n;
}
n = std::stoi(cells_[pos_++].text);
return *this;
}
iresolver& iresolver::operator>>(unsigned short& n)
{
if (pos_ < cells_.size())
{
std::wstringstream ss(cells_[pos_++].text);
ss >> n;
}
n = static_cast<unsigned short>(std::stoul(cells_[pos_++].text));
return *this;
}
iresolver& iresolver::operator>>(int& n)
{
if (pos_ < cells_.size())
{
std::wstringstream ss(cells_[pos_++].text);
ss >> n;
}
n = std::stoi(cells_[pos_++].text);
return *this;
}
iresolver& iresolver::operator>>(unsigned int& n)
{
if (pos_ < cells_.size())
{
std::wstringstream ss(cells_[pos_++].text);
ss >> n;
}
n = std::stoul(cells_[pos_++].text);
return *this;
}
iresolver& iresolver::operator>>(long& n)
{
if (pos_ < cells_.size())
{
std::wstringstream ss(cells_[pos_++].text);
ss >> n;
}
n = std::stol(cells_[pos_++].text);
return *this;
}
iresolver& iresolver::operator>>(unsigned long& n)
{
if (pos_ < cells_.size())
{
std::wstringstream ss(cells_[pos_++].text);
ss >> n;
}
n = std::stoul(cells_[pos_++].text);
return *this;
}
iresolver& iresolver::operator>>(long long& n)
{
if (pos_ < cells_.size())
{
std::wstringstream ss(cells_[pos_++].text);
ss >> n;
}
n = std::stoll(cells_[pos_++].text);
return *this;
}
iresolver& iresolver::operator>>(unsigned long long& n)
{
if (pos_ < cells_.size())
{
std::wstringstream ss(cells_[pos_++].text);
ss >> n;
}
n = std::stoull(cells_[pos_++].text);
return *this;
}
iresolver& iresolver::operator>>(float& f)
{
if (pos_ < cells_.size())
{
std::wstringstream ss(cells_[pos_++].text);
ss >> f;
}
f = std::stof(cells_[pos_++].text);
return *this;
}
iresolver& iresolver::operator>>(double& f)
{
if (pos_ < cells_.size())
{
std::wstringstream ss(cells_[pos_++].text);
ss >> f;
}
f = std::stod(cells_[pos_++].text);
return *this;
}
iresolver& iresolver::operator>>(long double& f)
{
if (pos_ < cells_.size())
{
std::wstringstream ss(cells_[pos_++].text);
ss >> f;
}
f = std::stold(cells_[pos_++].text);
return *this;
}
@@ -1183,8 +1147,9 @@ namespace nana
}
}
void item_checked(selection& vec) const
selection item_checked() const
{
selection vec;
index_pair id;
for(auto & cat : list_)
{
@@ -1197,6 +1162,7 @@ namespace nana
}
++id.cat;
}
return vec;
}
void select_range(index_pair fr, index_pair to, bool sel)
@@ -2595,7 +2561,7 @@ namespace nana
graph->string({ x + 20, y + txtoff }, categ.text, txt_color);
::nana::string str = L'(' + ::nana::to_wstring(categ.items.size()) + L')';
::nana::string str = L'(' + std::to_wstring(categ.items.size()) + L')';
unsigned str_w = graph->text_extent_size(str).width;
@@ -3699,8 +3665,7 @@ namespace nana
auto & ess = _m_ess();
if (ess.lister.insert(pos, std::move(text)))
{
window wd = handle();
if (false == API::empty_window(wd))
if (! empty())
{
auto & item = ess.lister.at(pos);
item.bgcolor = bgcolor();
@@ -3722,9 +3687,7 @@ namespace nana
auto listbox::checked() const -> selection
{
selection s;
_m_ess().lister.item_checked(s);
return std::move(s);
return _m_ess().lister.item_checked();
}
void listbox::clear(size_type cat)
@@ -3891,11 +3854,6 @@ namespace nana
return _m_ess().lister.anyobj(index_pair{cat, index}, allocate_if_empty);
}
auto listbox::_m_headers() const -> size_type
{
return _m_ess().header.cont().size();
}
drawerbase::listbox::category_t* listbox::_m_at_key(std::shared_ptr<nana::detail::key_interface> ptr)
{
auto & ess = _m_ess();

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

@@ -73,7 +73,7 @@ namespace nana
std::wstring value() const override
{
return ::nana::to_wstring(value_);
return std::to_wstring(value_);
}
bool value(const std::wstring& value_str, bool & diff) override
@@ -663,12 +663,12 @@ namespace nana
int spinbox::to_int() const
{
return ::nana::stoi(value());
return std::stoi(value());
}
double spinbox::to_double() const
{
return ::nana::stod(value());
return std::stod(value());
}
void spinbox::modifier(std::wstring prefix, std::wstring suffix)

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

@@ -456,13 +456,13 @@ namespace drawerbase {
textbox& textbox::from(int n)
{
_m_caption(::nana::to_wstring(n));
_m_caption(std::to_wstring(n));
return *this;
}
textbox& textbox::from(double d)
{
_m_caption(::nana::to_wstring(d));
_m_caption(std::to_wstring(d));
return *this;
}