From e7fc59f4a1baeb7efa2268317cf49953829a3119 Mon Sep 17 00:00:00 2001 From: Ove Kaaven Date: Fri, 23 Jul 1999 09:41:17 +0000 Subject: [PATCH] Couple of unicode fixes (the #if should be wxUSE_UNICODE, not wxUNICODE, and there's no sense in allocating a wxWX2MBbuf of len 200 then assigning a different buffer to it either) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/fs_inet.cpp | 4 ++-- src/common/http.cpp | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp index 3745300208..7c0b89d38a 100644 --- a/src/common/fs_inet.cpp +++ b/src/common/fs_inet.cpp @@ -86,9 +86,9 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri if (content == wxEmptyString) content = GetMimeTypeFromExt(location); if (s) { - char buf[256]; + wxChar buf[256]; - wxGetTempFileName( "wxhtml", buf); + wxGetTempFileName( _T("wxhtml"), buf); info = new wxInetCacheNode(buf, content); m_Cache.Put(right, info); diff --git a/src/common/http.cpp b/src/common/http.cpp index cb194e82d3..18beaf43cf 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -180,11 +180,6 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) { wxChar *tmp_buf; wxChar buf[200]; // 200 is arbitrary. -#if wxUNICODE - wxWX2MBbuf pathbuf((size_t)200); -#else - const wxWX2MBbuf pathbuf; -#endif wxString tmp_str; switch (req) { @@ -201,7 +196,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) tmp_str = wxURL::ConvertToValidURI(path); wxSprintf(buf, _T("%s %s HTTP/1.0\n\r"), tmp_buf, tmp_str.GetData()); - pathbuf = wxConvLibc.cWX2MB(buf); + const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf); Write(pathbuf, strlen(MBSTRINGCAST pathbuf)); SendHeaders(); Write("\n\r", 2); -- 2.45.2