Make status bar grip move to the left in RTL.

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

diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp
index c3730280895b95324d169a3ab9938408457df91a..1f2d5aaf0990a8bb7238a6934d7a239f5976475a 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,18 +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/utils.h"

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


@@ -101,8 +105,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


@@ -131,7 +135,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
 }
 


@@ -158,17 +162,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;


@@ -195,9 +199,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


@@ -206,7 +210,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;
     }
 


@@ -228,8 +232,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();


@@ -279,7 +283,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 )


@@ -324,12 +328,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)


@@ -347,14 +351,14 @@ 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();
 #else
 
     return m_bitmap.Ok();
 #else

-    return FALSE;
+    return false;

 #endif
 }
 
 #endif
 }
 


@@ -364,7 +368,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;


@@ -378,3 +382,4 @@ void wxBitmapDataObject::DoConvertToPng()
 #endif
 }
 
 #endif
 }
 

+#endif // wxUSE_DATAOBJ