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

fix some compiler errors on x64

Browse Source
This commit is contained in:
Jinhao 2016-07-18 04:21:05 +08:00
parent 98483d3e40
commit 7229c76807
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/gui/widgets/skeletons/text_editor.cpp
View File

@ -3241,7 +3241,7 @@ namespace nana{ namespace widgets
else if ((a.y == b.y) && a.y == text_coord.y) else if ((a.y == b.y) && a.y == text_coord.y)
{ {
auto sbegin_pos = (std::max)(a.x, text_coord.x); auto sbegin_pos = (std::max)(a.x, text_coord.x);
auto send_pos = (std::min)(text_coord.x + text_ptr->size(), b.x); auto send_pos = (std::min)(text_coord.x + static_cast<unsigned>(text_ptr->size()), b.x);
if (sbegin_pos < send_pos) if (sbegin_pos < send_pos)
{ {
@ -3265,7 +3265,7 @@ namespace nana{ namespace widgets
if (text_coord.x < b.x) if (text_coord.x < b.x)
{ {
sbegin = text_ptr->c_str(); sbegin = text_ptr->c_str();
send = text_ptr->c_str() + (std::min)(b.x - text_coord.x, text_ptr->size()); send = text_ptr->c_str() + (std::min)(b.x - text_coord.x, static_cast<unsigned>(text_ptr->size()));
} }
} }
} }
@ -3325,8 +3325,8 @@ namespace nana{ namespace widgets
auto ent_sbegin = (std::max)(sbegin, ent.begin); auto ent_sbegin = (std::max)(sbegin, ent.begin);
auto ent_send = (std::min)(send, ent.end); auto ent_send = (std::min)(send, ent.end);
unsigned select_pos = (ent_sbegin != ent.begin ? ent_sbegin - ent.begin : 0); unsigned select_pos = static_cast<unsigned>(ent_sbegin != ent.begin ? ent_sbegin - ent.begin : 0);
unsigned select_len = ent_send - ent_sbegin; unsigned select_len = static_cast<unsigned>(ent_send - ent_sbegin);
std::unique_ptr<unsigned[]> pxbuf{ new unsigned[len] }; std::unique_ptr<unsigned[]> pxbuf{ new unsigned[len] };
graph_.glyph_pixels(ent.begin, len, pxbuf.get()); graph_.glyph_pixels(ent.begin, len, pxbuf.get());