factor out the fd<->handlers map from wxFDIODispatcher into a separate wxMappedFDIODi...

[wxWidgets.git] / src / gtk / dataobj.cpp

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index 55d829e2d060b5c0c092075933211731960a5510..4c3e4225eb3a7b31136cad9be840092662933794 100644 (file)
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -58,12 +58,6 @@ wxDataFormat::wxDataFormat( wxDataFormatId type )
     SetType( type );
 }
 
-wxDataFormat::wxDataFormat( const wxChar *id )
-{
-    PrepareFormats();
-    SetId( id );
-}
-
 wxDataFormat::wxDataFormat( const wxString &id )
 {
     PrepareFormats();
@@ -138,12 +132,11 @@ 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 = gdk_atom_intern( (const char*) tmp.ToAscii(), FALSE );
+    m_format = gdk_atom_intern( id.ToAscii(), FALSE );
 }
 
 void wxDataFormat::PrepareFormats()
@@ -278,7 +271,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
                     // skip the slashes
                     lenPrefix += 2;
                 }
-                
+
                 // It would probably be nicer to use a GTK or Glib
                 // function to unescape the 8-bit strings pointed to
                 // by buf, but this does the same in wx code.