From 4ebef67e3e28ceb658b06eb1dc0748abca34a82e Mon Sep 17 00:00:00 2001 From: PB Date: Sun, 16 Jul 2017 15:39:26 +0200 Subject: [PATCH] Update update constructing wxBasicString from literal strings No real changes, just replace wxT() with wxS() as wxBasicString ctor now that it takes wxString and not "const wchar_t*" and remove the now unnecessary explicit "wxString()". --- src/msw/mediactrl_wmp10.cpp | 6 +++--- src/msw/webview_ie.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/msw/mediactrl_wmp10.cpp b/src/msw/mediactrl_wmp10.cpp index da014b8644..581d7076de 100644 --- a/src/msw/mediactrl_wmp10.cpp +++ b/src/msw/mediactrl_wmp10.cpp @@ -1061,12 +1061,12 @@ bool wxWMP10MediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags) if(!flags) { m_pWMPPlayer->put_enabled(VARIANT_FALSE); - m_pWMPPlayer->put_uiMode(wxBasicString(wxT("none"))); + m_pWMPPlayer->put_uiMode(wxBasicString(wxS("none"))); } else { // TODO: use "custom"? (note that CE only supports none/full) - m_pWMPPlayer->put_uiMode(wxBasicString(wxT("full"))); + m_pWMPPlayer->put_uiMode(wxBasicString(wxS("full"))); m_pWMPPlayer->put_enabled(VARIANT_TRUE); } @@ -1358,7 +1358,7 @@ wxLongLong wxWMP10MediaBackend::GetDownloadTotal() if(m_pWMPPlayer->get_currentMedia(&pWMPMedia) == 0) { BSTR bsOut; - pWMPMedia->getItemInfo(wxBasicString(wxT("FileSize")), + pWMPMedia->getItemInfo(wxBasicString(wxS("FileSize")), &bsOut); wxString sFileSize = wxConvertStringFromOle(bsOut); diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp index 79ea18b78f..848068d59d 100644 --- a/src/msw/webview_ie.cpp +++ b/src/msw/webview_ie.cpp @@ -1009,8 +1009,8 @@ void wxWebViewIE::FindInternal(const wxString& text, int flags, int internal_fla if(SUCCEEDED(document->QueryInterface(wxIID_IMarkupContainer, (void **)&pIMC))) { wxCOMPtr ptrBegin, ptrEnd; - wxBasicString attr_bstr(wxString("style=\"background-color:#ffff00\"")); - wxBasicString text_bstr(text.wc_str()); + wxBasicString attr_bstr(wxS("style=\"background-color:#ffff00\"")); + wxBasicString text_bstr(text); pIMS->CreateMarkupPointer(&ptrBegin); pIMS->CreateMarkupPointer(&ptrEnd);