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-14 00:30:03 +08:00
parent 009e7e7647
commit 8fc84938bf
10 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/gui/widgets/label.cpp
View File

@@ -259,7 +259,7 @@ namespace nana
return fp->bold;
}
const nana::string& _m_fontname(nana::widgets::skeletons::fblock* fp)
const std::string& _m_fontname(nana::widgets::skeletons::fblock* fp)
{
while(fp->font.empty())
{
@@ -274,13 +274,13 @@ namespace nana
{
if(fp != fblock_)
{
const nana::string& name = _m_fontname(fp);
auto& name = _m_fontname(fp);
auto fontsize = static_cast<unsigned>(_m_font_size(fp));
bool bold = _m_bold(fp);
if((fontsize != font_.size()) || bold != font_.bold() || name != font_.name())
{
font_.make(name.data(), fontsize, bold);
font_.make(name, fontsize, bold);
graph.typeface(font_);
}
fblock_ = fp;
@@ -606,7 +606,7 @@ namespace nana
::nana::paint::font font_;
struct def_font_tag
{
::nana::string font_name;
::std::string font_name;
std::size_t font_size;
bool font_bold;
::nana::color fgcolor;