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

Compilation fixes for wxMSW in wxUSE_STL=1 build.

Browse Source 
Add explicit conversions from wxString to wchar_t* as they don't happen
implicitly when wxUSE_STL=1.

Closes #13715.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-12-02 12:04:46 +00:00
parent 7daecf9e6a
commit c9a828e77f
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/graphics.cpp
View File

@@ -899,7 +899,7 @@ wxGDIPlusFontData::Init(const wxString& name,
const wxColour& col, const wxColour& col,
Unit fontUnit) Unit fontUnit)
{ {
m_font = new Font(name, size, style, fontUnit); m_font = new Font(name.wc_str(), size, style, fontUnit);
m_textBrush = new SolidBrush(wxColourToColor(col)); m_textBrush = new SolidBrush(wxColourToColor(col));
} }

8
src/msw/webview_ie.cpp
View File

@@ -698,7 +698,9 @@ void wxWebViewIE::RunScript(const wxString& javascript)
VARIANT level; VARIANT level;
VariantInit(&level); VariantInit(&level);
V_VT(&level) = VT_EMPTY; V_VT(&level) = VT_EMPTY;
window->execScript(SysAllocString(javascript), SysAllocString(language), &level); window->execScript(SysAllocString(javascript.wc_str()),
SysAllocString(language).wc_str(),
&level);
} }
document->Release(); document->Release();
} }
@@ -719,7 +721,9 @@ void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
wxFAIL_MSG("Could not retrive internet session"); wxFAIL_MSG("Could not retrive internet session");
} }
HRESULT hr = session->RegisterNameSpace(cf, CLSID_FileProtocol, handler->GetName(), 0, NULL, 0); HRESULT hr = session->RegisterNameSpace(cf, CLSID_FileProtocol,
handler->GetName().wc_str(),
0, NULL, 0);
if(FAILED(hr)) if(FAILED(hr))
{ {
wxFAIL_MSG("Could not register protocol"); wxFAIL_MSG("Could not register protocol");