From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 31 Jan 2012 13:09:11 +0000 (+0000)
Subject: Fix wxHTTP::SetPostBuffer() compilation in ANSI build.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c84ef5b9f71ea2a62daa6d70840a8d654fc0103d?ds=inline

Fix wxHTTP::SetPostBuffer() compilation in ANSI build.

wxString::mb_str() returns a raw pointer and not wxScopedCharBuffer when
wxUSE_UNICODE==0 so fix the code to do it differently in this case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 49f08f6dfb..f041115be9 100644
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -218,12 +218,20 @@ wxHTTP::SetPostText(const wxString& contentType,
                     const wxString& data,
                     const wxMBConv& conv)
 {
+#if wxUSE_UNICODE
     wxScopedCharBuffer scb = data.mb_str(conv);
-    if ( !scb.length() )
+    const size_t len = scb.length();
+    const char* const buf = scb.data();
+#else // !wxUSE_UNICODE
+    const size_t len = data.length();
+    const char* const buf = data.mb_str(conv);
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
+
+    if ( !len )
         return false;
 
     m_postBuffer.Clear();
-    m_postBuffer.AppendData(scb.data(), scb.length());
+    m_postBuffer.AppendData(buf, len);
     m_contentType = contentType;
 
     return true;