From 46a0544e6f59453ad9da19dfbb833e96a0a04bf2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 29 Jul 2012 22:08:46 +0000 Subject: [PATCH] No real changes, just use accessors in wxTextDataObject. Use {Set,Get}Text() instead of using m_text directly in wxTextDataObject as these virtual methods overridable and should be called in case the class doesn't actually use m_text for its storage at all. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/dobjcmn.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp index 2b6ce68efb..4c1acaa837 100644 --- a/src/common/dobjcmn.cpp +++ b/src/common/dobjcmn.cpp @@ -299,13 +299,14 @@ bool wxTextDataObject::SetData(const wxDataFormat& format, size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const { + const wxString& text = GetText(); if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 ) { - return m_text.utf8_length(); + return text.utf8_length(); } else // wxDF_TEXT { - const wxCharBuffer buf(wxConvLocal.cWC2MB(m_text.wc_str())); + const wxCharBuffer buf(wxConvLocal.cWC2MB(text.wc_str())); return buf ? strlen(buf) : 0; } } @@ -315,13 +316,14 @@ bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const if ( !buf ) return false; + const wxString& text = GetText(); if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 ) { - memcpy(buf, m_text.utf8_str(), m_text.utf8_length()); + memcpy(buf, text.utf8_str(), text.utf8_length()); } else // wxDF_TEXT { - const wxCharBuffer bufLocal(wxConvLocal.cWC2MB(m_text.wc_str())); + const wxCharBuffer bufLocal(wxConvLocal.cWC2MB(text.wc_str())); if ( !bufLocal ) return false; @@ -346,11 +348,11 @@ bool wxTextDataObject::SetData(const wxDataFormat& format, // is not in UTF-8 so do an extra check for tranquility, it shouldn't // matter much if we lose a bit of performance when pasting from // clipboard - m_text = wxString::FromUTF8(buf, len); + SetText(wxString::FromUTF8(buf, len)); } else // wxDF_TEXT, convert from current (non-UTF8) locale { - m_text = wxConvLocal.cMB2WC(buf, len, NULL); + SetText(wxConvLocal.cMB2WC(buf, len, NULL)); } return true; -- 2.47.2