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

fix GCC/Clang compiler errors

Browse Source
This commit is contained in:
Jinhao 2018-06-07 15:38:25 +08:00
parent 7a24df521e
commit 88d395353e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
/* /*
* Platform Implementation * Platform Implementation
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2017 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2018 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
@ -144,7 +144,7 @@ namespace detail
if (::GetTextExtentPoint32(dw->context, text, static_cast<int>(len), &size)) if (::GetTextExtentPoint32(dw->context, text, static_cast<int>(len), &size))
return nana::size(size.cx, size.cy); return nana::size(size.cx, size.cy);
#elif defined(NANA_X11) #elif defined(NANA_X11)
std::string utf8str = to_utf8(std::wstring(text, len)); std::string utf8text = to_utf8(std::wstring(text, len));
#if defined(NANA_USE_XFT) #if defined(NANA_USE_XFT)
XGlyphInfo ext; XGlyphInfo ext;
XftFont * fs = reinterpret_cast<XftFont*>(dw->font->native_handle()); XftFont * fs = reinterpret_cast<XftFont*>(dw->font->native_handle());
@ -154,7 +154,7 @@ namespace detail
#else #else
XRectangle ink; XRectangle ink;
XRectangle logic; XRectangle logic;
::XmbTextExtents(reinterpret_cast<XFontSet>(dw->font->native_handle()), utf8str.c_str(), utf8str.size(), &ink, &logic); ::XmbTextExtents(reinterpret_cast<XFontSet>(dw->font->native_handle()), utf8text.c_str(), utf8text.size(), &ink, &logic);
return nana::size(logic.width, logic.height); return nana::size(logic.width, logic.height);
#endif #endif
#endif #endif