From 02e2609962760aad5e859244ff2e4c4c15d1c739 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 27 Sep 2010 12:48:14 +0000 Subject: [PATCH] Small clean up in wxX11 Pango code. Don't use unnecessary explicit casts of wxCharBuffer to "const char *". Use wxCharBuffer::length() instead of strlen(). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/x11/dcclient.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp index 316dd68cf1..6ef0cb4f33 100644 --- a/src/x11/dcclient.cpp +++ b/src/x11/dcclient.cpp @@ -1571,7 +1571,7 @@ void wxWindowDCImpl::DoDrawText( const wxString &text, wxCoord x, wxCoord y ) pango_layout_set_font_description(layout, m_fontdesc); const wxCharBuffer data = wxConvUTF8.cWC2MB( text ); - pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); + pango_layout_set_text(layout, data, data.length()); // Measure layout. int w,h; @@ -1676,7 +1676,7 @@ void wxWindowDCImpl::DoGetTextExtent( const wxString &string, wxCoord *width, wx pango_layout_set_font_description(layout, m_fontdesc); const wxCharBuffer data = wxConvUTF8.cWC2MB( string ); - pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); + pango_layout_set_text(layout, data, data.length()); // Measure text. int w,h; -- 2.50.0