///////////////////////////////////////////////////////////////////////////////
-// Name: os2/dataobj.cpp
-// Purpose: implementation of wx[I]DataObject class
-// Author: David Webster
+// Name: mac/dataobj.cpp
+// Purpose: implementation of wxDataObject class
+// Author: Stefan Csomor
// Modified by:
// Created: 10/21/99
// RCS-ID: $Id$
-// Copyright: (c) 1999 David Webster
-// Licence: wxWindows license
+// Copyright: (c) 1999 Stefan Csomor
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
#include "wx/mstream.h"
#include "wx/image.h"
#include "wx/mac/private.h"
+#include "Scrap.h"
// ----------------------------------------------------------------------------
// functions
{
m_type = Type;
- if (m_type == wxDF_TEXT)
- m_format = 'TEXT';
+ if (m_type == wxDF_TEXT )
+ m_format = kScrapFlavorTypeText;
+ else if (m_type == wxDF_UNICODETEXT )
+ m_format = kScrapFlavorTypeUnicode ;
else if (m_type == wxDF_BITMAP || m_type == wxDF_METAFILE )
- m_format = 'PICT';
+ m_format = kScrapFlavorTypePicture;
else if (m_type == wxDF_FILENAME)
m_format = kDragFlavorTypeHFS ;
else
{
wxFAIL_MSG( wxT("invalid dataformat") );
- }
-}
-wxDataFormatId wxDataFormat::GetType() const
-{
- return m_type;
+ // this is '????' but it can't be used in the code because ??' is
+ // parsed as a trigraph!
+ m_format = 0x3f3f3f3f;
+ }
}
wxString wxDataFormat::GetId() const
{
- wxString sRet(""); // TODO: to name of ( m_format ) );
- return sRet;
+ // note that m_format is not a pointer to string, it *is* itself a 4
+ // character string
+ char text[5] ;
+ strncpy( text , (char*) &m_format , 4 ) ;
+ text[4] = 0 ;
+
+ return wxString::FromAscii( text ) ;
}
void wxDataFormat::SetId( NativeFormat format )
{
m_format = format;
- if (m_format == 'TEXT')
+ if (m_format == kScrapFlavorTypeText)
m_type = wxDF_TEXT;
- else
- if (m_format == 'PICT')
+ else if (m_format == kScrapFlavorTypeUnicode )
+ m_type = wxDF_UNICODETEXT;
+ else if (m_format == kScrapFlavorTypePicture)
m_type = wxDF_BITMAP;
- else
- if (m_format == kDragFlavorTypeHFS )
+ else if (m_format == kDragFlavorTypeHFS )
m_type = wxDF_FILENAME;
else
m_type = wxDF_PRIVATE;
void wxDataFormat::SetId( const wxChar* zId )
{
- wxString tmp(zId);
-
m_type = wxDF_PRIVATE;
m_format = 0;// TODO: get the format gdk_atom_intern( wxMBSTRINGCAST tmp.mbc_str(), FALSE );
}
{
m_filenames.Empty();
- wxString sFile( (const char *)pBuf); /* char, not wxChar */
-
- AddFile(sFile);
+ AddFile(wxString::FromAscii((char*)pBuf));
return TRUE;
}