Removed some useless static_cast.
This commit is contained in:
parent
cdba162897
commit
236ba4356e
@ -235,7 +235,7 @@ namespace nana{ namespace drawerbase
|
|||||||
|
|
||||||
if(shortkey)
|
if(shortkey)
|
||||||
{
|
{
|
||||||
unsigned off_w = (shortkey_pos ? graph.text_extent_size(mbstr.c_str(), static_cast<unsigned>(shortkey_pos)).width : 0);
|
unsigned off_w = (shortkey_pos ? graph.text_extent_size(mbstr.c_str(), shortkey_pos).width : 0);
|
||||||
|
|
||||||
wchar_t keystr[2] = {nana::utf::char_at(mbstr.c_str() + shortkey_pos, 0, 0), 0};
|
wchar_t keystr[2] = {nana::utf::char_at(mbstr.c_str() + shortkey_pos, 0, 0), 0};
|
||||||
auto shortkey_size = graph.text_extent_size(keystr, 1);
|
auto shortkey_size = graph.text_extent_size(keystr, 1);
|
||||||
|
|||||||
@ -161,7 +161,7 @@ namespace nana
|
|||||||
--(state_.index);
|
--(state_.index);
|
||||||
else if(recycle)
|
else if(recycle)
|
||||||
{
|
{
|
||||||
state_.index = static_cast<unsigned>(module_->items.size() - 1);
|
state_.index = module_->items.size() - 1;
|
||||||
state_.offset_y = last_offset_y;
|
state_.offset_y = last_offset_y;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -179,7 +179,7 @@ namespace nana
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(state_.index >= state_.offset_y + module_->max_items)
|
if(state_.index >= state_.offset_y + module_->max_items)
|
||||||
state_.offset_y = static_cast<unsigned>(state_.index - module_->max_items + 1);
|
state_.offset_y = state_.index - module_->max_items + 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@ -216,7 +216,7 @@ namespace nana
|
|||||||
|
|
||||||
if (hotkey)
|
if (hotkey)
|
||||||
{
|
{
|
||||||
unsigned off_w = (hotkey_pos ? graph.text_extent_size(text.c_str(), static_cast<unsigned>(hotkey_pos)).width : 0);
|
unsigned off_w = (hotkey_pos ? graph.text_extent_size(text.c_str(), hotkey_pos).width : 0);
|
||||||
nana::size hotkey_size = graph.text_extent_size(text.c_str() + hotkey_pos, 1);
|
nana::size hotkey_size = graph.text_extent_size(text.c_str() + hotkey_pos, 1);
|
||||||
|
|
||||||
unsigned ascent, descent, inleading;
|
unsigned ascent, descent, inleading;
|
||||||
|
|||||||
@ -751,7 +751,7 @@ namespace nana
|
|||||||
if((pos == npos) || (pos >= list_.size()))
|
if((pos == npos) || (pos >= list_.size()))
|
||||||
{
|
{
|
||||||
this->list_.emplace_back();
|
this->list_.emplace_back();
|
||||||
pos = static_cast<unsigned>(list_.size() - 1);
|
pos = list_.size() - 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
list_.emplace(iterator_at(pos));
|
list_.emplace(iterator_at(pos));
|
||||||
|
|||||||
@ -413,7 +413,7 @@ namespace paint
|
|||||||
|
|
||||||
nana::size graphics::text_extent_size(const std::wstring& text) const
|
nana::size graphics::text_extent_size(const std::wstring& text) const
|
||||||
{
|
{
|
||||||
return text_extent_size(text.c_str(), static_cast<unsigned>(text.length()));
|
return text_extent_size(text.c_str(), text.length());
|
||||||
}
|
}
|
||||||
|
|
||||||
nana::size graphics::text_extent_size(const wchar_t* str, std::size_t len) const
|
nana::size graphics::text_extent_size(const wchar_t* str, std::size_t len) const
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user