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

more changes to make wx compile without implicit wxString->char* conversion (for STL build)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-20 07:44:45 +00:00
parent d38f70b249
commit e0a050e347
55 changed files with 183 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/ole/dataobj.cpp
View File

@@ -139,7 +139,7 @@ private:
void wxDataFormat::SetId(const wxString& format)
{
m_format = (wxDataFormat::NativeFormat)::RegisterClipboardFormat(format);
m_format = (wxDataFormat::NativeFormat)::RegisterClipboardFormat(format.wx_str());
if ( !m_format )
{
wxLogError(_("Couldn't register clipboard format '%s'."), format);
@@ -1082,7 +1082,7 @@ size_t wxFileDataObject::GetDataSize() const
size_t len;
#if wxUSE_UNICODE_MSLU
if ( sizeOfChar == sizeof(char) )
len = strlen(wxConvFileName->cWC2MB(m_filenames[i]));
len = strlen(m_filenames[i].mb_str(*wxConvFileName));
else
#endif // wxUSE_UNICODE_MSLU
len = m_filenames[i].length();
@@ -1131,7 +1131,7 @@ bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const
#if wxUSE_UNICODE_MSLU
if ( sizeOfChar == sizeof(char) )
{
wxCharBuffer buf(wxConvFileName->cWC2MB(m_filenames[i]));
wxCharBuffer buf(m_filenames[i].mb_str(*wxConvFileName));
len = strlen(buf);
memcpy(pbuf, buf, len*sizeOfChar);
}