///////////////////////////////////////////////////////////////////////////////
-// Name: dataobj.cpp
+// Name: src/x11/dataobj.cpp
// Purpose: wxDataObject class
// Author: Julian Smart
// Id: $Id$
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
-#include "wx/defs.h"
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#if wxUSE_DATAOBJ
#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/app.h"
-#include "wx/image.h"
-#include "wx/log.h"
-#include "wx/utils.h"
#include "wx/x11/private.h"
//-------------------------------------------------------------------------
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)
#else
char *t = XGetAtomName ((Display*) wxGetDisplay(), m_format);
wxString ret = wxString::FromAscii( t );
- if (t)
+ if (t)
XFree( t );
return ret;
#endif
PrepareFormats();
m_type = wxDF_PRIVATE;
wxString tmp( id );
- m_format = XInternAtom( (Display*) wxGetDisplay(), tmp.ToAscii(), FALSE );
+ m_format = XInternAtom( (Display*) wxGetDisplay(), tmp.ToAscii(), FALSE );
#endif
}
bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
{
size_t nFormatCount = GetFormatCount(dir);
- if ( nFormatCount == 1 )
+ if ( nFormatCount == 1 )
{
return format == GetPreferredFormat();
}
- else
+ else
{
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;
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
for (size_t i = 0; i < m_filenames.GetCount(); i++)
{
- res += m_filenames[i].Len();
+ res += m_filenames[i].length();
res += 1;
}
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();
}
#endif // 0/1
- return TRUE;
+ return true;
}
void wxFileDataObject::AddFile( const wxString &filename )
{
wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") );
- return FALSE;
+ return false;
}
memcpy(buf, m_pngData, m_pngSize);
- return TRUE;
+ return true;
}
bool wxBitmapDataObject::SetData(size_t size, const void *buf)
wxPNGHandler handler;
if ( !handler.LoadFile( &image, mstream ) )
{
- return FALSE;
+ return false;
}
m_bitmap = image;
return m_bitmap.Ok();
#else
- return FALSE;
+ return false;
#endif
}
}
#endif // wxUSE_DATAOBJ
-