Changes corresponding to patch #841324 from Ian Brown:

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

diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp
index 21e8776a298d6b461e360c3c2b0eda2d68c1bc09..c095c13aa2a8ae3cfb95958a5fb83635a8601cf6 100644 (file)
--- a/src/x11/dataobj.cpp
+++ b/src/x11/dataobj.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dataobj.h"
 #endif
 
     #pragma implementation "dataobj.h"
 #endif
 


@@ -102,7 +102,7 @@ wxString wxDataFormat::GetId() const
     return wxEmptyString;
 #else
     char *t = XGetAtomName ((Display*) wxGetDisplay(), m_format);
     return wxEmptyString;
 #else
     char *t = XGetAtomName ((Display*) wxGetDisplay(), m_format);

-    wxString ret( t );  // this will convert from ascii to Unicode
+    wxString ret = wxString::FromAscii( t );

     if (t) 
         XFree( t );
     return ret;
     if (t) 
         XFree( t );
     return ret;


@@ -132,7 +132,7 @@ void wxDataFormat::SetId( const wxChar *id )
     PrepareFormats();
     m_type = wxDF_PRIVATE;
     wxString tmp( id );
     PrepareFormats();
     m_type = wxDF_PRIVATE;
     wxString tmp( id );

-    m_format = XInternAtom( (Display*) wxGetDisplay(), wxMBSTRINGCAST tmp.mbc_str(), FALSE );  // what is the string cast for?
+    m_format = XInternAtom( (Display*) wxGetDisplay(), tmp.ToAscii(), FALSE ); 

 #endif
 }
 
 #endif
 }
 


@@ -351,7 +351,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
         return FALSE;
     }
 
         return FALSE;
     }
 

-    m_bitmap = image.ConvertToBitmap();
+    m_bitmap = image;

 
     return m_bitmap.Ok();
 #else
 
     return m_bitmap.Ok();
 #else


@@ -365,7 +365,7 @@ void wxBitmapDataObject::DoConvertToPng()
     if (!m_bitmap.Ok())
         return;
 
     if (!m_bitmap.Ok())
         return;
 

-    wxImage image( m_bitmap );
+    wxImage image = m_bitmap.ConvertToImage();

     wxPNGHandler handler;
 
     wxCountingOutputStream count;
     wxPNGHandler handler;
 
     wxCountingOutputStream count;