projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compilation with new dc code
[wxWidgets.git]
/
src
/
x11
/
dataobj.cpp
diff --git
a/src/x11/dataobj.cpp
b/src/x11/dataobj.cpp
index b0c6bbc7d4d658c6df6e71a6062f053cef5ac991..b9b8f7a37d259fa8dd4e89d287287749d1cda3d9 100644
(file)
--- a/
src/x11/dataobj.cpp
+++ b/
src/x11/dataobj.cpp
@@
-57,12
+57,6
@@
wxDataFormat::wxDataFormat( wxDataFormatId type )
SetType( type );
}
SetType( type );
}
-wxDataFormat::wxDataFormat( const wxChar *id )
-{
- PrepareFormats();
- SetId( id );
-}
-
wxDataFormat::wxDataFormat( const wxString &id )
{
PrepareFormats();
wxDataFormat::wxDataFormat( const wxString &id )
{
PrepareFormats();
@@
-129,13
+123,12
@@
void wxDataFormat::SetId( NativeFormat format )
m_type = wxDF_PRIVATE;
}
m_type = wxDF_PRIVATE;
}
-void wxDataFormat::SetId( const wx
Char *
id )
+void wxDataFormat::SetId( const wx
String&
id )
{
#if !wxUSE_NANOX
PrepareFormats();
m_type = wxDF_PRIVATE;
{
#if !wxUSE_NANOX
PrepareFormats();
m_type = wxDF_PRIVATE;
- wxString tmp( id );
- m_format = XInternAtom( (Display*) wxGetDisplay(), tmp.ToAscii(), FALSE );
+ m_format = XInternAtom( (Display*) wxGetDisplay(), id.ToAscii(), FALSE );
#endif
}
#endif
}