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 ae566bb1b2da2eccc1957363ea9897b799c82d56..6e59a054da09fd879ba2b39e40ff60d7b9d3fb94 100644 (file)
--- 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())
        {
                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;
        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)
 {
                &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);
 };
        istringstream *is = new istringstream(s);
        return LoadStream(is);
 };

diff --git a/wxPython/contrib/iewin/wxactivex.cpp b/wxPython/contrib/iewin/wxactivex.cpp
index c58e2ee90c4eefb2f6c556e04be44a76ea1d2f7e..e53f3b3cbc79569fc0d653e9d6a1f5f71a682aeb 100644 (file)
--- 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;
 {
        m_bAmbientUserMode = true;
     m_docAdviseCookie = 0;

-       CreateActiveX((LPOLESTR) wxConvUTF8.cMB2WC(progId).data());
+       CreateActiveX((LPOLESTR) (const wchar_t*)progId.wc_str(wxConvUTF8));

 }
 
 wxActiveX::~wxActiveX()
 }
 
 wxActiveX::~wxActiveX()