Merge in from trunk r64802 - r68625

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

diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp
index 21e8776a298d6b461e360c3c2b0eda2d68c1bc09..01e5cd9ed02d66f16ac9292ca0a39e6e9bc31fbf 100644 (file)
--- a/src/x11/dataobj.cpp
+++ b/src/x11/dataobj.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dataobj.cpp
+// Name:        src/x11/dataobj.cpp

 // Purpose:     wxDataObject class
 // Author:      Julian Smart
 // Id:          $Id$
 // Purpose:     wxDataObject class
 // Author:      Julian Smart
 // Id:          $Id$


@@ -7,19 +7,22 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "dataobj.h"
-#endif
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#include "wx/defs.h"
+#if wxUSE_DATAOBJ

 
 #include "wx/dataobj.h"
 
 #include "wx/dataobj.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/image.h"
+#endif
+

 #include "wx/mstream.h"
 #include "wx/mstream.h"

-#include "wx/app.h"
-#include "wx/image.h"
-#include "wx/log.h"

 
 

-#include "wx/utils.h"

 #include "wx/x11/private.h"
 
 //-------------------------------------------------------------------------
 #include "wx/x11/private.h"
 
 //-------------------------------------------------------------------------


@@ -54,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();


@@ -77,7 +74,7 @@ void wxDataFormat::SetType( wxDataFormatId type )
     PrepareFormats();
     m_type = type;
 
     PrepareFormats();
     m_type = type;
 

-    if (m_type == wxDF_TEXT)
+    if (m_type == wxDF_TEXT || m_type == wxDF_UNICODETEXT)

         m_format = g_textAtom;
     else
     if (m_type == wxDF_BITMAP)
         m_format = g_textAtom;
     else
     if (m_type == wxDF_BITMAP)


@@ -102,8 +99,8 @@ 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
-    if (t) 
+    wxString ret = wxString::FromAscii( t );
+    if (t)

         XFree( t );
     return ret;
 #endif
         XFree( t );
     return ret;
 #endif


@@ -126,13 +123,12 @@ void wxDataFormat::SetId( NativeFormat format )
         m_type = wxDF_PRIVATE;
 }
 
         m_type = wxDF_PRIVATE;
 }
 

-void wxDataFormat::SetId( const wxChar *id )
+void wxDataFormat::SetId( const wxString& 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(), wxMBSTRINGCAST tmp.mbc_str(), FALSE );  // what is the string cast for?
+    m_format = XInternAtom( (Display*) wxGetDisplay(), id.ToAscii(), FALSE );

 #endif
 }
 
 #endif
 }
 


@@ -159,17 +155,17 @@ wxDataObject::wxDataObject()
 bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
 {
     size_t nFormatCount = GetFormatCount(dir);
 bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
 {
     size_t nFormatCount = GetFormatCount(dir);

-    if ( nFormatCount == 1 ) 
+    if ( nFormatCount == 1 )

     {
         return format == GetPreferredFormat();
     }
     {
         return format == GetPreferredFormat();
     }

-    else 
+    else

     {
         wxDataFormat *formats = new wxDataFormat[nFormatCount];
         GetAllFormats(formats,dir);
 
         size_t n;
     {
         wxDataFormat *formats = new wxDataFormat[nFormatCount];
         GetAllFormats(formats,dir);
 
         size_t n;

-        for ( n = 0; n < nFormatCount; n++ ) 
+        for ( n = 0; n < nFormatCount; n++ )

         {
             if ( formats[n] == format )
                 break;
         {
             if ( formats[n] == format )
                 break;


@@ -196,9 +192,9 @@ bool wxFileDataObject::GetDataHere(void *buf) const
         filenames += (wxChar) 0;
     }
 
         filenames += (wxChar) 0;
     }
 

-    memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );
+    memcpy( buf, filenames.mbc_str(), filenames.length() + 1 );

 
 

-    return TRUE;
+    return true;

 }
 
 size_t wxFileDataObject::GetDataSize() const
 }
 
 size_t wxFileDataObject::GetDataSize() const


@@ -207,7 +203,7 @@ size_t wxFileDataObject::GetDataSize() const
 
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {
 
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {

-        res += m_filenames[i].Len();
+        res += m_filenames[i].length();

         res += 1;
     }
 
         res += 1;
     }
 


@@ -229,8 +225,8 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
             break;
         wxString file( filenames );  // this returns the first file
         AddFile( file );
             break;
         wxString file( filenames );  // this returns the first file
         AddFile( file );

-        pos += file.Len()+1;
-        filenames += file.Len()+1;
+        pos += file.length()+1;
+        filenames += file.length()+1;

     }
 #else // 1
     m_filenames.Empty();
     }
 #else // 1
     m_filenames.Empty();


@@ -247,12 +243,12 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
         if ( (*p == '\r' && *(p+1) == '\n') || !*p )
         {
             size_t lenPrefix = 5; // strlen("file:")
         if ( (*p == '\r' && *(p+1) == '\n') || !*p )
         {
             size_t lenPrefix = 5; // strlen("file:")

-            if ( filename.Left(lenPrefix).MakeLower() == _T("file:") )
+            if ( filename.Left(lenPrefix).MakeLower() == wxT("file:") )

             {
                 // sometimes the syntax is "file:filename", sometimes it's
                 // URL-like: "file://filename" - deal with both
             {
                 // sometimes the syntax is "file:filename", sometimes it's
                 // URL-like: "file://filename" - deal with both

-                if ( filename[lenPrefix] == _T('/') &&
-                     filename[lenPrefix + 1] == _T('/') )
+                if ( filename[lenPrefix] == wxT('/') &&
+                     filename[lenPrefix + 1] == wxT('/') )

                 {
                     // skip the slashes
                     lenPrefix += 2;
                 {
                     // skip the slashes
                     lenPrefix += 2;


@@ -263,7 +259,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
             }
             else
             {
             }
             else
             {

-                wxLogDebug(_T("Unsupported URI '%s' in wxFileDataObject"),
+                wxLogDebug(wxT("Unsupported URI '%s' in wxFileDataObject"),

                            filename.c_str());
             }
 
                            filename.c_str());
             }
 


@@ -280,7 +276,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
     }
 #endif // 0/1
 
     }
 #endif // 0/1
 

-    return TRUE;
+    return true;

 }
 
 void wxFileDataObject::AddFile( const wxString &filename )
 }
 
 void wxFileDataObject::AddFile( const wxString &filename )


@@ -325,12 +321,12 @@ bool wxBitmapDataObject::GetDataHere(void *buf) const
     {
         wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") );
 
     {
         wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") );
 

-        return FALSE;
+        return false;

     }
 
     memcpy(buf, m_pngData, m_pngSize);
 
     }
 
     memcpy(buf, m_pngData, m_pngSize);
 

-    return TRUE;
+    return true;

 }
 
 bool wxBitmapDataObject::SetData(size_t size, const void *buf)
 }
 
 bool wxBitmapDataObject::SetData(size_t size, const void *buf)


@@ -348,24 +344,24 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
     wxPNGHandler handler;
     if ( !handler.LoadFile( &image, mstream ) )
     {
     wxPNGHandler handler;
     if ( !handler.LoadFile( &image, mstream ) )
     {

-        return FALSE;
+        return false;

     }
 
     }
 

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

 
 

-    return m_bitmap.Ok();
+    return m_bitmap.IsOk();

 #else
 #else

-    return FALSE;
+    return false;

 #endif
 }
 
 void wxBitmapDataObject::DoConvertToPng()
 {
 #if wxUSE_LIBPNG
 #endif
 }
 
 void wxBitmapDataObject::DoConvertToPng()
 {
 #if wxUSE_LIBPNG

-    if (!m_bitmap.Ok())
+    if (!m_bitmap.IsOk())

         return;
 
         return;
 

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

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


@@ -379,3 +375,4 @@ void wxBitmapDataObject::DoConvertToPng()
 #endif
 }
 
 #endif
 }
 

+#endif // wxUSE_DATAOBJ