From: Robin Dunn <robin@alldunn.com>
Date: Sun, 7 Jul 2002 00:09:48 +0000 (+0000)
Subject: Changes for wxUSE_UNICODE==1
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/24ad91f346d85b50e4ac66d26850c143f7d8c32f

Changes for wxUSE_UNICODE==1


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

diff --git a/wxPython/contrib/iewin/IEHtmlWin.cpp b/wxPython/contrib/iewin/IEHtmlWin.cpp
index ae566bb1b2..6e59a054da 100644
--- a/wxPython/contrib/iewin/IEHtmlWin.cpp
+++ b/wxPython/contrib/iewin/IEHtmlWin.cpp
@@ -241,7 +241,7 @@ void wxIEHtmlWin::SetCharset(wxString charset)
 	{
 		wxAutoOleInterface<IHTMLDocument2> doc(IID_IHTMLDocument2, disp);
 		if (doc.Ok())
-			doc->put_charset((BSTR) wxConvUTF8.cMB2WC(charset).data());
+            doc->put_charset((BSTR) (const wchar_t*)charset.wc_str(wxConvUTF8));
 	};
 };
 
@@ -316,14 +316,14 @@ void wxIEHtmlWin::LoadUrl(const wxString& url)
 	headers.vt = VT_EMPTY;
 
 	HRESULT hret = 0;
-	hret = m_webBrowser->Navigate((BSTR) wxConvUTF8.cMB2WC(url).data(),
+	hret = m_webBrowser->Navigate((BSTR) (const wchar_t*)url.wc_str(wxConvUTF8),
 		&navFlag, &targetFrame, &postData, &headers);
 };
 
 
 bool  wxIEHtmlWin::LoadString(wxString html)
 {
-	string s = html.c_str();
+	string s = html.mb_str(wxConvUTF8);
 	istringstream *is = new istringstream(s);
 	return LoadStream(is);
 };
diff --git a/wxPython/contrib/iewin/wxactivex.cpp b/wxPython/contrib/iewin/wxactivex.cpp
index c58e2ee90c..e53f3b3cbc 100644
--- a/wxPython/contrib/iewin/wxactivex.cpp
+++ b/wxPython/contrib/iewin/wxactivex.cpp
@@ -206,7 +206,7 @@ wxActiveX::wxActiveX(wxWindow * parent, wxString progId, wxWindowID id,
 {
 	m_bAmbientUserMode = true;
     m_docAdviseCookie = 0;
-	CreateActiveX((LPOLESTR) wxConvUTF8.cMB2WC(progId).data());
+	CreateActiveX((LPOLESTR) (const wchar_t*)progId.wc_str(wxConvUTF8));
 }
 
 wxActiveX::~wxActiveX()