use wxString, not wxChar*, in wxDataFormat ctor and SetId() method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -61,12 +61,6 @@ wxDataFormat::wxDataFormat( wxDataFormatId type )
|
||||
SetType( type );
|
||||
}
|
||||
|
||||
wxDataFormat::wxDataFormat( const wxChar *id )
|
||||
{
|
||||
PrepareFormats();
|
||||
SetId( id );
|
||||
}
|
||||
|
||||
wxDataFormat::wxDataFormat( const wxString &id )
|
||||
{
|
||||
PrepareFormats();
|
||||
@@ -129,13 +123,12 @@ void wxDataFormat::SetId( NativeFormat format )
|
||||
m_type = wxDF_PRIVATE;
|
||||
}
|
||||
|
||||
void wxDataFormat::SetId( const wxChar *id )
|
||||
void wxDataFormat::SetId( const wxString& id )
|
||||
{
|
||||
PrepareFormats();
|
||||
m_type = wxDF_PRIVATE;
|
||||
wxString tmp( id );
|
||||
m_format = XInternAtom( wxGlobalDisplay(),
|
||||
tmp.mbc_str(), False );
|
||||
id.mbc_str(), False );
|
||||
}
|
||||
|
||||
void wxDataFormat::PrepareFormats()
|
||||
|
||||
Reference in New Issue
Block a user