From 26f03c44d08586f51baf65625dccaeb25d303dcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 5 May 2007 18:55:59 +0000 Subject: [PATCH] use utf8_str() in wxDFB git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dfb/private.h | 11 ----------- src/dfb/dc.cpp | 4 ++-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/include/wx/dfb/private.h b/include/wx/dfb/private.h index 9a36a5ea5e..6193cc975f 100644 --- a/include/wx/dfb/private.h +++ b/include/wx/dfb/private.h @@ -17,17 +17,6 @@ #include "wx/dfb/wrapdfb.h" #include -//----------------------------------------------------------------------------- -// 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 //----------------------------------------------------------------------------- diff --git a/src/dfb/dc.cpp b/src/dfb/dc.cpp index 004c88c969..49aa202b63 100644 --- a/src/dfb/dc.cpp +++ b/src/dfb/dc.cpp @@ -338,7 +338,7 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxCHECK_RET( m_textForegroundColour.Ok(), wxT("invalid foreground color") ); 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 // to be set to the pen: @@ -497,7 +497,7 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, DFBRectangle rect; 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 // only scaled according to m_scaleY