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

Remove unwanted CR characters from MSW OLE source file

Browse Source 
Somehow recent changes to this file added CRs (^M) characters to the
ends of some lines, remove them to avoid having a mix of Unix and DOS
EOLs in the same file.

No real changes.
This commit is contained in:
Vadim Zeitlin
2017-07-16 16:18:40 +02:00
parent 4ebef67e3e
commit 10f7d35694
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/msw/ole/oleutils.cpp
View File

@@ -70,38 +70,38 @@ WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxBasicString // wxBasicString
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void wxBasicString::AssignFromString(const wxString& str) void wxBasicString::AssignFromString(const wxString& str)
{ {
SysFreeString(m_bstrBuf); SysFreeString(m_bstrBuf);
m_bstrBuf = SysAllocString(str.wc_str(*wxConvCurrent)); m_bstrBuf = SysAllocString(str.wc_str(*wxConvCurrent));
}
BSTR wxBasicString::Detach()
{
BSTR bstr = m_bstrBuf;
m_bstrBuf = NULL;
return bstr;
} }
BSTR* wxBasicString::ByRef() BSTR wxBasicString::Detach()
{ {
BSTR bstr = m_bstrBuf;
m_bstrBuf = NULL;
return bstr;
}
BSTR* wxBasicString::ByRef()
{
wxASSERT_MSG(!m_bstrBuf, wxASSERT_MSG(!m_bstrBuf,
wxS("Can't get direct access to initialized BSTR")); wxS("Can't get direct access to initialized BSTR"));
return &m_bstrBuf; return &m_bstrBuf;
} }
wxBasicString& wxBasicString::operator=(const wxBasicString& src) wxBasicString& wxBasicString::operator=(const wxBasicString& src)
{ {
if ( this != &src ) if ( this != &src )
{ {
wxCHECK_MSG(m_bstrBuf == NULL || m_bstrBuf != src.m_bstrBuf, wxCHECK_MSG(m_bstrBuf == NULL || m_bstrBuf != src.m_bstrBuf,
*this, wxS("Attempting to assign already owned BSTR")); *this, wxS("Attempting to assign already owned BSTR"));
SysFreeString(m_bstrBuf); SysFreeString(m_bstrBuf);
m_bstrBuf = src.Copy(); m_bstrBuf = src.Copy();
} }
return *this; return *this;
} }