...fixing up a previous Unicode fix.

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

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index 342d81340179bac9d94f0f0b806bb5263db49932..bb9e817c05304aa895feea142831dde22e273d31 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -56,13 +56,13 @@ wxDataFormat::wxDataFormat( const wxString &id )
     SetId( id );
 }
 
     SetId( id );
 }
 

-wxDataFormat::wxDataFormat( wxDataFormat &format )
+wxDataFormat::wxDataFormat( const wxDataFormat &format )

 {
     if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE );
     m_type = format.GetType();
     m_id = format.GetId();
     m_hasAtom = TRUE;
 {
     if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE );
     m_type = format.GetType();
     m_id = format.GetId();
     m_hasAtom = TRUE;

-    m_atom = format.GetAtom();
+    m_atom = ((wxDataFormat &)format).GetAtom();    // const_cast

 }
 
 wxDataFormat::wxDataFormat( const GdkAtom atom )
 }
 
 wxDataFormat::wxDataFormat( const GdkAtom atom )


@@ -192,7 +192,7 @@ size_t wxDataBroker::GetFormatCount() const
     return m_dataObjects.GetCount();
 }
 
     return m_dataObjects.GetCount();
 }
 

-wxDataFormat &wxDataBroker::GetPreferredFormat() const
+wxDataFormatId wxDataBroker::GetPreferredFormat() const

 {
     wxNode *node = m_dataObjects.Nth( m_preferred );
 
 {
     wxNode *node = m_dataObjects.Nth( m_preferred );
 


@@ -200,7 +200,7 @@ wxDataFormat &wxDataBroker::GetPreferredFormat() const
 
     wxDataObject* data_obj = (wxDataObject*)node->Data();
 
 
     wxDataObject* data_obj = (wxDataObject*)node->Data();
 

-    return data_obj->GetFormat();
+    return data_obj->GetFormat().GetType();

 }
 
 wxDataFormat &wxDataBroker::GetNthFormat( size_t nth ) const
 }
 
 wxDataFormat &wxDataBroker::GetNthFormat( size_t nth ) const