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

use UTF-8 for string representation

Browse Source
This commit is contained in:
Jinhao
2015-12-31 01:09:52 +08:00
parent 0a396c12c2
commit a42ebe19b4
38 changed files with 182 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/paint/detail/native_paint_interface.cpp
View File

@@ -154,14 +154,14 @@ namespace detail
return nana::size();
}
nana::size text_extent_size(drawable_type dw, const nana::char_t * text, std::size_t len)
nana::size text_extent_size(drawable_type dw, const wchar_t * text, std::size_t len)
{
if (nullptr == dw || nullptr == text || 0 == len)
return{};
nana::size extents = raw_text_extent_size(dw, text, len);
const nana::char_t* const end = text + len;
const wchar_t* const end = text + len;
int tabs = 0;
for(; text != end; ++text)
{
@@ -173,7 +173,7 @@ namespace detail
return extents;
}
void draw_string(drawable_type dw, const nana::point& pos, const nana::char_t * str, std::size_t len)
void draw_string(drawable_type dw, const nana::point& pos, const wchar_t * str, std::size_t len)
{
#if defined(NANA_WINDOWS)
::TextOut(dw->context, pos.x, pos.y, str, static_cast<int>(len));