X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd5bf2a6e3a7d03e8b1f97e989eecdcc63f7151f..bb69661b050ad2c774985e225cce0e497a875143:/src/gtk1/dataobj.cpp?ds=sidebyside diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp index 6f8a442e14..bb9e817c05 100644 --- a/src/gtk1/dataobj.cpp +++ b/src/gtk1/dataobj.cpp @@ -4,11 +4,11 @@ // 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" @@ -17,6 +17,13 @@ #include "gdk/gdk.h" + +//------------------------------------------------------------------------- +// global data +//------------------------------------------------------------------------- + +GdkAtom g_textAtom = 0; + //------------------------------------------------------------------------- // wxDataFormat //------------------------------------------------------------------------- @@ -25,36 +32,47 @@ IMPLEMENT_CLASS(wxDataFormat, wxObject) wxDataFormat::wxDataFormat() { + if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE ); 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 ); SetType( type ); } +wxDataFormat::wxDataFormat( const wxChar *id ) +{ + if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE ); + SetId( id ); +} + wxDataFormat::wxDataFormat( const wxString &id ) { + if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE ); SetId( id ); } -wxDataFormat::wxDataFormat( wxDataFormat &format ) +wxDataFormat::wxDataFormat( const wxDataFormat &format ) { + if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE ); 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 ); m_hasAtom = TRUE; - + m_atom = atom; - - if (m_atom == GDK_TARGET_STRING) + + if (m_atom == g_textAtom) { m_type = wxDF_TEXT; } else @@ -65,41 +83,41 @@ wxDataFormat::wxDataFormat( const GdkAtom atom ) { m_type = wxDF_PRIVATE; m_id = gdk_atom_name( m_atom ); - - if (m_id == "file:ALL") + + if (m_id == _T("file:ALL")) { m_type = wxDF_FILENAME; } } } -void wxDataFormat::SetType( wxDataType type ) +void wxDataFormat::SetType( wxDataFormatId type ) { m_type = type; - + if (m_type == wxDF_TEXT) { - m_id = "STRING"; - } + m_id = _T("STRING"); + } else if (m_type == wxDF_BITMAP) { - m_id = "BITMAP"; - } + m_id = _T("BITMAP"); + } else if (m_type == wxDF_FILENAME) { - m_id = "file:ALL"; + m_id = _T("file:ALL"); } else { - wxFAIL_MSG( "invalid dataformat" ); + wxFAIL_MSG( _T("invalid dataformat") ); } - + m_hasAtom = FALSE; } - -wxDataType wxDataFormat::GetType() const + +wxDataFormatId wxDataFormat::GetType() const { return m_type; } @@ -109,7 +127,7 @@ wxString wxDataFormat::GetId() const return m_id; } -void wxDataFormat::SetId( const wxString &id ) +void wxDataFormat::SetId( const wxChar *id ) { m_type = wxDF_PRIVATE; m_id = id; @@ -121,33 +139,33 @@ GdkAtom wxDataFormat::GetAtom() if (!m_hasAtom) { m_hasAtom = TRUE; - + if (m_type == wxDF_TEXT) { - m_atom = GDK_TARGET_STRING; - } + m_atom = g_textAtom; + } else if (m_type == wxDF_BITMAP) { m_atom = GDK_TARGET_BITMAP; - } + } else if (m_type == wxDF_PRIVATE) { - m_atom = gdk_atom_intern( WXSTRINGCAST( m_id ), FALSE ); - } + 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; } @@ -157,93 +175,93 @@ GdkAtom wxDataFormat::GetAtom() 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()) { - return dobj->WriteData( dest ); + dobj->WriteData( dest ); } - + node = node->Next(); } } @@ -257,7 +275,7 @@ IMPLEMENT_ABSTRACT_CLASS( wxDataObject, wxObject ) wxDataObject::wxDataObject() { } - + wxDataObject::~wxDataObject() { } @@ -267,7 +285,7 @@ wxDataFormat &wxDataObject::GetFormat() return m_format; } -wxDataType wxDataObject::GetFormatType() const +wxDataFormatId wxDataObject::GetFormatType() const { return m_format.GetType(); } @@ -279,9 +297,9 @@ wxString wxDataObject::GetFormatId() const GdkAtom wxDataObject::GetFormatAtom() const { - GdkAtom ret = m_format.GetAtom(); + GdkAtom ret = ((wxDataObject*) this)->m_format.GetAtom(); return ret; -} +} // ---------------------------------------------------------------------------- // wxTextDataObject @@ -297,11 +315,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; } @@ -323,9 +341,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 // ---------------------------------------------------------------------------- @@ -338,26 +356,26 @@ wxFileDataObject::wxFileDataObject() } void wxFileDataObject::AddFile( const wxString &file ) -{ - m_files += file; - m_files += (char)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 // ---------------------------------------------------------------------------- @@ -372,7 +390,7 @@ wxBitmapDataObject::wxBitmapDataObject() wxBitmapDataObject::wxBitmapDataObject( const wxBitmap& bitmap ) { m_format.SetType( wxDF_BITMAP ); - + m_bitmap = bitmap; } @@ -400,54 +418,38 @@ void wxBitmapDataObject::WriteBitmap( const wxBitmap &bitmap, void *dest ) const { memcpy( dest, m_bitmap.GetPixmap(), GetSize() ); } - + // ---------------------------------------------------------------------------- // 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(); + + m_format.SetId( id ); - memcpy( m_data, data, size ); + 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 @@ -457,10 +459,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() ); }