X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a126fcc3438c6b2693090e8c97761fa12d8ca7a..ae8f57691329af997e274a3fce5b25c5e5f00f2f:/src/gtk1/dataobj.cpp diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp index 913ee2eca3..1e87427cd7 100644 --- a/src/gtk1/dataobj.cpp +++ b/src/gtk1/dataobj.cpp @@ -4,16 +4,18 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "dataobj.h" + #pragma implementation "dataobj.h" #endif #include "wx/dataobj.h" #include "wx/app.h" #include "wx/debug.h" +#include "wx/mstream.h" +#include "wx/image.h" #include "gdk/gdk.h" @@ -23,6 +25,7 @@ //------------------------------------------------------------------------- GdkAtom g_textAtom = 0; +GdkAtom g_pngAtom = 0; //------------------------------------------------------------------------- // wxDataFormat @@ -32,46 +35,46 @@ IMPLEMENT_CLASS(wxDataFormat, wxObject) wxDataFormat::wxDataFormat() { - if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE ); + PrepareFormats(); m_type = wxDF_INVALID; m_hasAtom = FALSE; m_atom = (GdkAtom) 0; } -wxDataFormat::wxDataFormat( wxDataType type ) +wxDataFormat::wxDataFormat( wxDataFormatId type ) { - if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE ); + PrepareFormats(); SetType( type ); } -wxDataFormat::wxDataFormat( const char *id ) +wxDataFormat::wxDataFormat( const wxChar *id ) { - if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE ); + PrepareFormats(); SetId( id ); } wxDataFormat::wxDataFormat( const wxString &id ) { - if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE ); + PrepareFormats(); SetId( id ); } -wxDataFormat::wxDataFormat( wxDataFormat &format ) +wxDataFormat::wxDataFormat( const wxDataFormat &format ) { - if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE ); + PrepareFormats(); m_type = format.GetType(); m_id = format.GetId(); m_hasAtom = TRUE; - m_atom = format.GetAtom(); + m_atom = ((wxDataFormat &)format).GetAtom(); // const_cast } wxDataFormat::wxDataFormat( const GdkAtom atom ) { - if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE ); + PrepareFormats(); m_hasAtom = TRUE; - + m_atom = atom; - + if (m_atom == g_textAtom) { m_type = wxDF_TEXT; @@ -83,7 +86,7 @@ wxDataFormat::wxDataFormat( const GdkAtom atom ) { m_type = wxDF_PRIVATE; m_id = gdk_atom_name( m_atom ); - + if (m_id == _T("file:ALL")) { m_type = wxDF_FILENAME; @@ -91,19 +94,19 @@ wxDataFormat::wxDataFormat( const GdkAtom atom ) } } -void wxDataFormat::SetType( wxDataType type ) +void wxDataFormat::SetType( wxDataFormatId type ) { m_type = type; - + if (m_type == wxDF_TEXT) { m_id = _T("STRING"); - } + } else if (m_type == wxDF_BITMAP) { - m_id = _T("BITMAP"); - } + m_id = _T("image/png"); + } else if (m_type == wxDF_FILENAME) { @@ -113,11 +116,11 @@ void wxDataFormat::SetType( wxDataType type ) { wxFAIL_MSG( _T("invalid dataformat") ); } - + m_hasAtom = FALSE; } - -wxDataType wxDataFormat::GetType() const + +wxDataFormatId wxDataFormat::GetType() const { return m_type; } @@ -127,7 +130,7 @@ wxString wxDataFormat::GetId() const return m_id; } -void wxDataFormat::SetId( const char *id ) +void wxDataFormat::SetId( const wxChar *id ) { m_type = wxDF_PRIVATE; m_id = id; @@ -139,7 +142,7 @@ GdkAtom wxDataFormat::GetAtom() if (!m_hasAtom) { m_hasAtom = TRUE; - + if (m_type == wxDF_TEXT) { m_atom = g_textAtom; @@ -148,120 +151,126 @@ GdkAtom wxDataFormat::GetAtom() if (m_type == wxDF_BITMAP) { m_atom = GDK_TARGET_BITMAP; - } + } else if (m_type == wxDF_PRIVATE) { m_atom = gdk_atom_intern( MBSTRINGCAST m_id.mbc_str(), FALSE ); - } + } else if (m_type == wxDF_FILENAME) { m_atom = gdk_atom_intern( "file:ALL", FALSE ); - } + } else { m_hasAtom = FALSE; m_atom = (GdkAtom) 0; } } - + return m_atom; } +void wxDataFormat::PrepareFormats() +{ + if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE ); + if (!g_pngAtom) g_pngAtom = gdk_atom_intern( "image/png", FALSE ); +} + //------------------------------------------------------------------------- // wxDataBroker //------------------------------------------------------------------------- IMPLEMENT_CLASS(wxDataBroker,wxObject) -wxDataBroker::wxDataBroker() -{ +wxDataBroker::wxDataBroker() +{ m_dataObjects.DeleteContents(TRUE); m_preferred = 0; } void wxDataBroker::Add( wxDataObject *dataObject, bool preferred ) -{ +{ if (preferred) m_preferred = m_dataObjects.GetCount(); m_dataObjects.Append( dataObject ); -} - +} + size_t wxDataBroker::GetFormatCount() const -{ - return m_dataObjects.GetCount(); +{ + return m_dataObjects.GetCount(); } - -wxDataFormat &wxDataBroker::GetPreferredFormat() const -{ + +wxDataFormatId wxDataBroker::GetPreferredFormat() const +{ wxNode *node = m_dataObjects.Nth( m_preferred ); - + wxASSERT( node ); - + wxDataObject* data_obj = (wxDataObject*)node->Data(); - - return data_obj->GetFormat(); + + return data_obj->GetFormat().GetType(); } - + wxDataFormat &wxDataBroker::GetNthFormat( size_t nth ) const -{ +{ wxNode *node = m_dataObjects.Nth( nth ); wxASSERT( node ); - + wxDataObject* data_obj = (wxDataObject*)node->Data(); - + return data_obj->GetFormat(); } - + bool wxDataBroker::IsSupportedFormat( wxDataFormat &format ) const -{ +{ wxNode *node = m_dataObjects.First(); while (node) { wxDataObject *dobj = (wxDataObject*)node->Data(); - + if (dobj->GetFormat().GetAtom() == format.GetAtom()) { return TRUE; } - + node = node->Next(); } - + return FALSE; } - + size_t wxDataBroker::GetSize( wxDataFormat& format ) const { wxNode *node = m_dataObjects.First(); while (node) { wxDataObject *dobj = (wxDataObject*)node->Data(); - + if (dobj->GetFormat().GetAtom() == format.GetAtom()) { return dobj->GetSize(); } - + node = node->Next(); } - + return 0; } - + void wxDataBroker::WriteData( wxDataFormat& format, void *dest ) const { wxNode *node = m_dataObjects.First(); while (node) { wxDataObject *dobj = (wxDataObject*)node->Data(); - + if (dobj->GetFormat().GetAtom() == format.GetAtom()) { dobj->WriteData( dest ); } - + node = node->Next(); } } @@ -275,7 +284,7 @@ IMPLEMENT_ABSTRACT_CLASS( wxDataObject, wxObject ) wxDataObject::wxDataObject() { } - + wxDataObject::~wxDataObject() { } @@ -285,7 +294,7 @@ wxDataFormat &wxDataObject::GetFormat() return m_format; } -wxDataType wxDataObject::GetFormatType() const +wxDataFormatId wxDataObject::GetFormatType() const { return m_format.GetType(); } @@ -299,7 +308,7 @@ GdkAtom wxDataObject::GetFormatAtom() const { GdkAtom ret = ((wxDataObject*) this)->m_format.GetAtom(); return ret; -} +} // ---------------------------------------------------------------------------- // wxTextDataObject @@ -315,11 +324,11 @@ wxTextDataObject::wxTextDataObject() wxTextDataObject::wxTextDataObject( const wxString& data ) { m_format.SetType( wxDF_TEXT ); - + m_data = data; } -void wxTextDataObject::SetText( const wxString& data ) +void wxTextDataObject::SetText( const wxString& data ) { m_data = data; } @@ -341,9 +350,9 @@ size_t wxTextDataObject::GetSize() const void wxTextDataObject::WriteString( const wxString &str, void *dest ) const { - memcpy( dest, m_data.c_str(), GetSize() ); + memcpy( dest, str.mb_str(), str.Len()+1 ); } - + // ---------------------------------------------------------------------------- // wxFileDataObject // ---------------------------------------------------------------------------- @@ -356,26 +365,26 @@ wxFileDataObject::wxFileDataObject() } void wxFileDataObject::AddFile( const wxString &file ) -{ - m_files += file; - m_files += (wxChar)0; +{ + m_files += file; + m_files += (wxChar)0; } - + wxString wxFileDataObject::GetFiles() const -{ - return m_files; +{ + return m_files; } - + void wxFileDataObject::WriteData( void *dest ) const { - memcpy( dest, m_files.c_str(), GetSize() ); + memcpy( dest, m_files.mbc_str(), GetSize() ); } - + size_t wxFileDataObject::GetSize() const { return m_files.Len() + 1; } - + // ---------------------------------------------------------------------------- // wxBitmapDataObject // ---------------------------------------------------------------------------- @@ -385,18 +394,28 @@ IMPLEMENT_DYNAMIC_CLASS( wxBitmapDataObject, wxDataObject ) wxBitmapDataObject::wxBitmapDataObject() { m_format.SetType( wxDF_BITMAP ); + m_pngData = (char*)NULL; + m_pngSize = 0; } wxBitmapDataObject::wxBitmapDataObject( const wxBitmap& bitmap ) { m_format.SetType( wxDF_BITMAP ); - + m_pngData = (char*)NULL; + m_pngSize = 0; m_bitmap = bitmap; + DoConvertToPng(); +} + +wxBitmapDataObject::~wxBitmapDataObject() +{ + if (m_pngData) delete[] m_pngData; } void wxBitmapDataObject::SetBitmap( const wxBitmap &bitmap ) { m_bitmap = bitmap; + DoConvertToPng(); } wxBitmap wxBitmapDataObject::GetBitmap() const @@ -411,61 +430,77 @@ void wxBitmapDataObject::WriteData( void *dest ) const size_t wxBitmapDataObject::GetSize() const { - return 0; + return m_pngSize; } void wxBitmapDataObject::WriteBitmap( const wxBitmap &bitmap, void *dest ) const { - memcpy( dest, m_bitmap.GetPixmap(), GetSize() ); +// if (m_bitmap == bitmap) + memcpy( dest, m_pngData, m_pngSize ); } + +void wxBitmapDataObject::SetPngData( const char *pngData, size_t pngSize ) +{ + if (m_pngData) delete[] m_pngData; + m_pngData = (char*) NULL; + m_pngSize = pngSize; + m_pngData = new char[m_pngSize]; + memcpy( m_pngData, pngData, m_pngSize ); + + wxMemoryInputStream mstream( pngData, pngSize ); + wxImage image; + wxPNGHandler handler; + handler.LoadFile( &image, mstream ); + m_bitmap = image.ConvertToBitmap(); +} + +void wxBitmapDataObject::DoConvertToPng() +{ + if (m_pngData) delete[] m_pngData; + wxImage image( m_bitmap ); + wxPNGHandler handler; + + wxCountingOutputStream count; + handler.SaveFile( &image, count ); + m_pngSize = count.GetSize() + 100; // sometimes the size seems to vary ??? + m_pngData = new char[m_pngSize]; + + wxMemoryOutputStream mstream( m_pngData, m_pngSize ); + handler.SaveFile( &image, mstream ); +} + // ---------------------------------------------------------------------------- // wxPrivateDataObject // ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS( wxPrivateDataObject, wxDataObject ) -wxPrivateDataObject::wxPrivateDataObject() -{ - m_id = "application/"; - m_id += wxTheApp->GetAppName(); - - m_format.SetId( m_id ); - - m_size = 0; - m_data = (char*) NULL; -} - -wxPrivateDataObject::~wxPrivateDataObject() -{ - if (m_data) delete[] m_data; -} - -void wxPrivateDataObject::SetId( const wxString& id ) -{ - m_id = id; - m_format.SetId( m_id ); -} - -wxString wxPrivateDataObject::GetId() const -{ - return m_id; +void wxPrivateDataObject::Free() +{ + if ( m_data ) + free(m_data); } -void wxPrivateDataObject::SetData( const char *data, size_t size ) +wxPrivateDataObject::wxPrivateDataObject() { - m_size = size; - - if (m_data) delete[] m_data; - - m_data = new char[size]; + wxString id = _T("application/"); + id += wxTheApp->GetAppName(); - memcpy( m_data, data, size ); + m_format.SetId( id ); + + m_size = 0; + m_data = (void *)NULL; } -char* wxPrivateDataObject::GetData() const +void wxPrivateDataObject::SetData( const void *data, size_t size ) { - return m_data; + Free(); + + m_size = size; + m_data = malloc(size); + + memcpy( m_data, data, size ); } void wxPrivateDataObject::WriteData( void *dest ) const @@ -475,10 +510,10 @@ void wxPrivateDataObject::WriteData( void *dest ) const size_t wxPrivateDataObject::GetSize() const { - return m_size; + return m_size; } -void wxPrivateDataObject::WriteData( const char *data, void *dest ) const +void wxPrivateDataObject::WriteData( const void *data, void *dest ) const { memcpy( dest, data, GetSize() ); }