Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes for wxUSE_UNICODE==1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-07-07 00:09:48 +00:00
parent 3181cff44d
commit 24ad91f346
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wxPython/contrib/iewin/IEHtmlWin.cpp
View File

@@ -241,7 +241,7 @@ void wxIEHtmlWin::SetCharset(wxString charset)
{ {
wxAutoOleInterface<IHTMLDocument2> doc(IID_IHTMLDocument2, disp); wxAutoOleInterface<IHTMLDocument2> doc(IID_IHTMLDocument2, disp);
if (doc.Ok()) 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; headers.vt = VT_EMPTY;
HRESULT hret = 0; 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); &navFlag, &targetFrame, &postData, &headers);
}; };
bool wxIEHtmlWin::LoadString(wxString html) bool wxIEHtmlWin::LoadString(wxString html)
{ {
string s = html.c_str(); string s = html.mb_str(wxConvUTF8);
istringstream *is = new istringstream(s); istringstream *is = new istringstream(s);
return LoadStream(is); return LoadStream(is);
}; };

2
wxPython/contrib/iewin/wxactivex.cpp
View File

@@ -206,7 +206,7 @@ wxActiveX::wxActiveX(wxWindow * parent, wxString progId, wxWindowID id,
{ {
m_bAmbientUserMode = true; m_bAmbientUserMode = true;
m_docAdviseCookie = 0; m_docAdviseCookie = 0;
CreateActiveX((LPOLESTR) wxConvUTF8.cMB2WC(progId).data()); CreateActiveX((LPOLESTR) (const wchar_t*)progId.wc_str(wxConvUTF8));
} }
wxActiveX::~wxActiveX() wxActiveX::~wxActiveX()