AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use utf8_str() in wxDFB

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2007-05-05 18:55:59 +00:00
parent b04edcaf5f
commit 26f03c44d0
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/dfb/private.h
View File

@ -17,17 +17,6 @@
#include "wx/dfb/wrapdfb.h" #include "wx/dfb/wrapdfb.h"
#include <directfb_version.h> #include <directfb_version.h>
//-----------------------------------------------------------------------------
// strings conversion
//-----------------------------------------------------------------------------
// convert string from wxString to UTF-8 encoded const char*
#if wxUSE_UNICODE
#define wxSTR_TO_DFB(s) (s).mb_str(wxConvUTF8)
#else
#define wxSTR_TO_DFB(s) wxConvUTF8.cWC2MB((s).wc_str(*wxConvUI))
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// misc helpers // misc helpers
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

4
src/dfb/dc.cpp
View File

@ -338,7 +338,7 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
wxCHECK_RET( m_textForegroundColour.Ok(), wxCHECK_RET( m_textForegroundColour.Ok(),
wxT("invalid foreground color") ); wxT("invalid foreground color") );
SelectColour(m_textForegroundColour); SelectColour(m_textForegroundColour);
m_surface->DrawString(wxSTR_TO_DFB(text), -1, xx, yy, DSTF_LEFT | DSTF_TOP); m_surface->DrawString(text.utf8_str(), -1, xx, yy, DSTF_LEFT | DSTF_TOP);
// restore pen's colour, because other drawing functions expect the colour // restore pen's colour, because other drawing functions expect the colour
// to be set to the pen: // to be set to the pen:
@ -497,7 +497,7 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
DFBRectangle rect; DFBRectangle rect;
wxIDirectFBFontPtr f = GetCurrentFont(); wxIDirectFBFontPtr f = GetCurrentFont();
if ( f->GetStringExtents(wxSTR_TO_DFB(string), -1, &rect, NULL) ) if ( f->GetStringExtents(string.utf8_str(), -1, &rect, NULL) )
{ {
// VS: YDEV is corrent, it should *not* be XDEV, because font's are // VS: YDEV is corrent, it should *not* be XDEV, because font's are
// only scaled according to m_scaleY // only scaled according to m_scaleY