// Created: 10/21/99
// RCS-ID: $Id$
// Copyright: (c) 1999 David Webster
-// Licence: wxWindows license
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
#include "wx/dataobj.h"
#include "wx/mstream.h"
#include "wx/image.h"
+#include "wx/mac/private.h"
// ----------------------------------------------------------------------------
// functions
wxDataFormat::wxDataFormat()
{
- m_vType = wxDF_INVALID;
- m_vFormat = 0;
+ m_type = wxDF_INVALID;
+ m_format = 0;
}
-wxDataFormat::wxDataFormat(
- wxDataFormatId vType
-)
+wxDataFormat::wxDataFormat( wxDataFormatId vType )
{
- PrepareFormats();
SetType(vType);
}
-wxDataFormat::wxDataFormat(
- const wxChar* zId
-)
+wxDataFormat::wxDataFormat( const wxChar* zId)
{
- PrepareFormats();
SetId(zId);
}
-wxDataFormat::wxDataFormat(
- const wxString& rId
-)
+wxDataFormat::wxDataFormat( const wxString& rId)
{
- PrepareFormats();
SetId(rId);
}
-wxDataFormat::wxDataFormat(
- NativeFormat vFormat
-)
+wxDataFormat::wxDataFormat( NativeFormat vFormat)
{
- PrepareFormats();
SetId(vFormat);
}
-void wxDataFormat::SetType(
- wxDataFormatId vType
-)
+void wxDataFormat::SetType( wxDataFormatId Type )
{
- m_vType = vType;
-
- if (m_vType == wxDF_TEXT)
- m_vFormat = 0;
- else
- if (m_vType == wxDF_BITMAP)
- m_vFormat = 0;
- else
- if (m_vType == wxDF_FILENAME)
- m_vFormat = 0;
+ m_type = Type;
+
+ if (m_type == wxDF_TEXT)
+ m_format = 'TEXT';
+ else if (m_type == wxDF_BITMAP || m_type == wxDF_METAFILE )
+ m_format = 'PICT';
+ else if (m_type == wxDF_FILENAME)
+ m_format = kDragFlavorTypeHFS ;
else
{
wxFAIL_MSG( wxT("invalid dataformat") );
wxDataFormatId wxDataFormat::GetType() const
{
- return m_vType;
+ return m_type;
}
wxString wxDataFormat::GetId() const
{
- wxString sRet(""); // TODO: gdk_atom_name( m_format ) );
+ wxString sRet(""); // TODO: to name of ( m_format ) );
return sRet;
}
-void wxDataFormat::SetId(
- NativeFormat vFormat
-)
+void wxDataFormat::SetId( NativeFormat format )
{
- m_vFormat = vFormat;
-// TODO:
-/*
- if (m_format == g_textAtom)
+ m_format = format;
+
+ if (m_format == 'TEXT')
m_type = wxDF_TEXT;
else
- if (m_format == g_pngAtom)
+ if (m_format == 'PICT')
m_type = wxDF_BITMAP;
else
- if (m_format == g_fileAtom)
+ if (m_format == kDragFlavorTypeHFS )
m_type = wxDF_FILENAME;
else
m_type = wxDF_PRIVATE;
-*/
}
-void wxDataFormat::SetId(
- const wxChar* zId
-)
+void wxDataFormat::SetId( const wxChar* zId )
{
wxString tmp(zId);
- m_vType = wxDF_PRIVATE;
- m_vFormat = 0;// TODO: get the format gdk_atom_intern( wxMBSTRINGCAST tmp.mbc_str(), FALSE );
-}
-
-void wxDataFormat::PrepareFormats()
-{
-// TODO:
-/*
- if (!g_textAtom)
- g_textAtom = gdk_atom_intern( "STRING", FALSE );
- if (!g_pngAtom)
- g_pngAtom = gdk_atom_intern( "image/png", FALSE );
- if (!g_fileAtom)
- g_fileAtom = gdk_atom_intern( "file:ALL", FALSE );
-*/
+ m_type = wxDF_PRIVATE;
+ m_format = 0;// TODO: get the format gdk_atom_intern( wxMBSTRINGCAST tmp.mbc_str(), FALSE );
}
//-------------------------------------------------------------------------
}
else
{
- wxDataFormat* pFormats = new wxDataFormat[nFormatCount];
+ wxDataFormat* pFormats = new wxDataFormat[nFormatCount];
GetAllFormats( pFormats
,vDir
);
size_t wxFileDataObject::GetDataSize() const
{
- size_t nRes = 0;
+ size_t nRes = 0;
for (size_t i = 0; i < m_filenames.GetCount(); i++)
{
, const void* pBuf
)
{
- /* TODO */
+ m_filenames.Empty();
- wxString sFile( (const char *)pBuf); /* char, not wxChar */
+ wxString sFile( (const char *)pBuf); /* char, not wxChar */
AddFile(sFile);
}
wxBitmapDataObject::wxBitmapDataObject(
- const wxBitmap& rBitmap
+ const wxBitmap& rBitmap
)
: wxBitmapDataObjectBase(rBitmap)
{
Init();
-
- DoConvertToPng();
+ if ( m_bitmap.Ok() )
+ {
+ m_pictHandle = m_bitmap.GetPict( &m_pictCreated ) ;
+ }
}
wxBitmapDataObject::~wxBitmapDataObject()
const wxBitmap& rBitmap
)
{
- ClearAll();
+ Clear();
wxBitmapDataObjectBase::SetBitmap(rBitmap);
- DoConvertToPng();
+ if ( m_bitmap.Ok() )
+ {
+ m_pictHandle = m_bitmap.GetPict( &m_pictCreated ) ;
+ }
+}
+
+void wxBitmapDataObject::Init()
+{
+ m_pictHandle = NULL ;
+ m_pictCreated = false ;
+}
+
+void wxBitmapDataObject::Clear()
+{
+ if ( m_pictCreated && m_pictHandle )
+ {
+ KillPicture( (PicHandle) m_pictHandle ) ;
+ }
+ m_pictHandle = NULL ;
}
bool wxBitmapDataObject::GetDataHere(
void* pBuf
) const
{
- if (!m_pngSize)
+ if (!m_pictHandle)
{
wxFAIL_MSG(wxT("attempt to copy empty bitmap failed"));
return FALSE;
}
- memcpy(pBuf, m_pngData, m_pngSize);
+ memcpy(pBuf, *(Handle)m_pictHandle, GetHandleSize((Handle)m_pictHandle));
return TRUE;
}
+size_t wxBitmapDataObject::GetDataSize() const
+{
+ return GetHandleSize((Handle)m_pictHandle) ;
+}
+
bool wxBitmapDataObject::SetData(
size_t nSize
, const void* pBuf
)
{
Clear();
- m_pngSize = nSize;
- m_pngData = malloc(m_pngSize);
-
- memcpy(m_pngData, pBuf, m_pngSize);
-
- wxMemoryInputStream vMstream((char*)m_pngData, m_pngSize);
- wxImage vImage;
- wxPNGHandler vHandler;
-
- if (!vHandler.LoadFile(&vImage, vMstream))
- {
- return FALSE;
- }
-
- m_bitmap = vImage.ConvertToBitmap();
+ PicHandle picHandle = (PicHandle) NewHandle( nSize ) ;
+ memcpy( *picHandle , pBuf , nSize ) ;
+ m_pictHandle = picHandle ;
+ m_pictCreated = false ;
+ Rect frame = (**picHandle).picFrame ;
+
+ m_bitmap.SetPict( picHandle ) ;
+ m_bitmap.SetWidth( frame.right - frame.left ) ;
+ m_bitmap.SetHeight( frame.bottom - frame.top ) ;
return m_bitmap.Ok();
}
-
-void wxBitmapDataObject::DoConvertToPng()
-{
- if (!m_bitmap.Ok())
- return;
-
- wxImage vImage(m_bitmap);
- wxPNGHandler vHandler;
- wxCountingOutputStream vCount;
-
- vHandler.SaveFile(&vImage, vCount);
-
- m_pngSize = vCount.GetSize() + 100; // sometimes the size seems to vary ???
- m_pngData = malloc(m_pngSize);
-
- wxMemoryOutputStream vMstream((char*) m_pngData, m_pngSize);
-
- vHandler.SaveFile(&vImage, vMstream );
-}
-
projects / wxWidgets.git / blobdiff