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

minor cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-03-23 22:04:57 +00:00
parent b910a8add4
commit 5aa67d6619
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/mac/carbon/dataobj.cpp
View File

@@ -26,7 +26,6 @@
#include "wx/metafile.h" #include "wx/metafile.h"
#include "wx/tokenzr.h" #include "wx/tokenzr.h"
#include "wx/mac/private.h" #include "wx/mac/private.h"
#ifndef __DARWIN__ #ifndef __DARWIN__
@@ -130,7 +129,7 @@ void wxDataFormat::SetId( NativeFormat format )
default: default:
m_type = wxDF_PRIVATE; m_type = wxDF_PRIVATE;
char text[5]; char text[5];
strncpy( text, (char*)&format, 4 ); memcpy( text, (const char*)&format, 4 );
text[4] = 0; text[4] = 0;
m_id = wxString::FromAscii( text ); m_id = wxString::FromAscii( text );
break; break;
@@ -171,14 +170,14 @@ bool wxDataObject::IsSupportedFormat( const wxDataFormat& rFormat, Direction vDi
} }
else else
{ {
wxDataFormat* pFormats = new wxDataFormat[nFormatCount]; wxDataFormat *pFormats = new wxDataFormat[nFormatCount];
GetAllFormats( pFormats, vDir ); GetAllFormats( pFormats, vDir );
for (size_t n = 0; n < nFormatCount; n++) for (size_t n = 0; n < nFormatCount; n++)
{ {
if (pFormats[n] == rFormat) if (pFormats[n] == rFormat)
{ {
found = true; found = true;
break; break;
} }
} }
@@ -205,16 +204,16 @@ void wxTextDataObject::GetAllFormats( wxDataFormat *formats, wxDataObjectBase::D
// wxFileDataObject // wxFileDataObject
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void wxFileDataObject::GetFileNames(wxCharBuffer &buf) const void wxFileDataObject::GetFileNames( wxCharBuffer &buf ) const
{ {
wxString filenames; wxString filenames;
for (size_t i = 0; i < m_filenames.GetCount(); i++) for (size_t i = 0; i < m_filenames.GetCount(); i++)
{ {
filenames += m_filenames[i]; filenames += m_filenames[i];
filenames += wxT('\n'); filenames += wxT('\n');
} }
buf = filenames.fn_str(); buf = filenames.fn_str();
} }
@@ -224,9 +223,11 @@ bool wxFileDataObject::GetDataHere( void *pBuf ) const
return false; return false;
wxCharBuffer buf; wxCharBuffer buf;
GetFileNames( buf ); size_t buffLength;
memcpy( pBuf, (const char*) buf, strlen(buf) + 1 ); GetFileNames( buf );
buffLength = strlen( buf );
memcpy( pBuf, (const char*)buf, buffLength + 1 );
return true; return true;
} }
@@ -234,22 +235,26 @@ bool wxFileDataObject::GetDataHere( void *pBuf ) const
size_t wxFileDataObject::GetDataSize() const size_t wxFileDataObject::GetDataSize() const
{ {
wxCharBuffer buf; wxCharBuffer buf;
GetFileNames( buf ); size_t buffLength;
return strlen(buf) + 1; GetFileNames( buf );
buffLength = strlen( buf );
return buffLength + 1;
} }
bool wxFileDataObject::SetData( size_t nSize, const void *pBuf ) bool wxFileDataObject::SetData( size_t nSize, const void *pBuf )
{ {
wxString filenames; wxString filenames;
#if wxUSE_UNICODE #if wxUSE_UNICODE
filenames = wxString( (const char*) pBuf , *wxConvFileName ); filenames = wxString( (const char*)pBuf, *wxConvFileName );
#else #else
filenames = wxString( wxConvFileName->cMB2WX( pBuf ) , wxConvLocal ); filenames = wxString( wxConvFileName->cMB2WX( pBuf ), wxConvLocal );
#endif #endif
m_filenames = wxStringTokenize( filenames , wxT("\n") , wxTOKEN_STRTOK ); m_filenames = wxStringTokenize( filenames, wxT("\n"), wxTOKEN_STRTOK );
return true; return true;
} }