X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12db77cab1054d288a2b3e2d07e58ad1d6386a53..659fb68d746cbbfa69626fd408592757c420da02:/src/motif/dataobj.cpp diff --git a/src/motif/dataobj.cpp b/src/motif/dataobj.cpp index 5564b4c24c..c96ec26e15 100644 --- a/src/motif/dataobj.cpp +++ b/src/motif/dataobj.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dataobj.cpp +// Name: src/motif/dataobj.cpp // Purpose: wxDataObject class // Author: Julian Smart // Id: $Id$ @@ -7,25 +7,35 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "dataobj.h" -#endif - -#include "wx/defs.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_CLIPBOARD #include "wx/dataobj.h" -#include "wx/app.h" +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/utils.h" +#endif + +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include -#include "wx/utils.h" +#ifdef __VMS__ +#pragma message enable nosimpint +#endif + +#include "wx/motif/private.h" //------------------------------------------------------------------------- // global data //------------------------------------------------------------------------- -Atom g_textAtom = 0; +Atom g_textAtom = 0; +Atom g_bitmapAtom = 0; +Atom g_fileAtom = 0; //------------------------------------------------------------------------- // wxDataFormat @@ -33,187 +43,141 @@ Atom g_textAtom = 0; wxDataFormat::wxDataFormat() { - if (!g_textAtom) g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE ); + // do *not* call PrepareFormats() from here for 2 reasons: + // + // 1. we will have time to do it later because some other Set function + // must be called before we really need them + // + // 2. doing so prevents us from declaring global wxDataFormats because + // calling PrepareFormats (and thus gdk_atom_intern) before GDK is + // initialised will result in a crash m_type = wxDF_INVALID; - m_hasAtom = FALSE; - m_atom = (Atom) 0; + m_format = (Atom) 0; } wxDataFormat::wxDataFormat( wxDataFormatId type ) { - if (!g_textAtom) g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE ); + PrepareFormats(); SetType( type ); } -wxDataFormat::wxDataFormat( const wxChar *id ) -{ - if (!g_textAtom) g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE ); - SetId( id ); -} - wxDataFormat::wxDataFormat( const wxString &id ) { - if (!g_textAtom) g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE ); + PrepareFormats(); SetId( id ); } -wxDataFormat::wxDataFormat( const wxDataFormat &format ) +wxDataFormat::wxDataFormat( NativeFormat format ) { - if (!g_textAtom) g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE ); - m_type = format.GetType(); - m_id = format.GetId(); - m_hasAtom = TRUE; - m_atom = ((wxDataFormat &)format).GetAtom(); // const_cast -} - -wxDataFormat::wxDataFormat( const Atom atom ) -{ - if (!g_textAtom) g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE ); - m_hasAtom = TRUE; - - m_atom = atom; - - if (m_atom == g_textAtom) - { - m_type = wxDF_TEXT; - } else -/* - if (m_atom == GDK_TARGET_BITMAP) - { - m_type = wxDF_BITMAP; - } else -*/ - { - m_type = wxDF_PRIVATE; - m_id = XGetAtomName( (Display*) wxGetDisplay(), m_atom ); - - if (m_id == wxT("file:ALL")) - { - m_type = wxDF_FILENAME; - } - } + PrepareFormats(); + SetId( format ); } void wxDataFormat::SetType( wxDataFormatId type ) { + PrepareFormats(); m_type = type; if (m_type == wxDF_TEXT) - { - m_id = wxT("STRING"); - } + m_format = g_textAtom; else if (m_type == wxDF_BITMAP) - { - m_id = wxT("BITMAP"); - } + m_format = g_bitmapAtom; else if (m_type == wxDF_FILENAME) - { - m_id = wxT("file:ALL"); - } + m_format = g_fileAtom; else { wxFAIL_MSG( wxT("invalid dataformat") ); } +} - m_hasAtom = FALSE; +wxDataFormatId wxDataFormat::GetType() const +{ + return m_type; } -void wxDataFormat::SetId( const wxChar *id ) +wxString wxDataFormat::GetId() const { - m_type = wxDF_PRIVATE; - m_id = id; - m_hasAtom = FALSE; + char *t = XGetAtomName ((Display*) wxGetDisplay(), m_format); + wxString ret( t ); // this will convert from ascii to Unicode + if (t) + XFree( t ); + return ret; } -Atom wxDataFormat::GetAtom() +void wxDataFormat::SetId( NativeFormat format ) { - if (!m_hasAtom) - { - m_hasAtom = TRUE; - - if (m_type == wxDF_TEXT) - { - m_atom = g_textAtom; - } - else -/* - if (m_type == wxDF_BITMAP) - { - m_atom = GDK_TARGET_BITMAP; - } - else -*/ - if (m_type == wxDF_PRIVATE) - { - m_atom = XInternAtom( (Display*) wxGetDisplay(), wxMBSTRINGCAST m_id.mbc_str(), FALSE ); - } - else - if (m_type == wxDF_FILENAME) - { - m_atom = XInternAtom( (Display*) wxGetDisplay(), "file:ALL", FALSE ); - } - else - { - m_hasAtom = FALSE; - m_atom = (Atom) 0; - } - } + PrepareFormats(); + m_format = format; - return m_atom; + if (m_format == g_textAtom) + m_type = wxDF_TEXT; + else + if (m_format == g_bitmapAtom) + m_type = wxDF_BITMAP; + else + if (m_format == g_fileAtom) + m_type = wxDF_FILENAME; + else + m_type = wxDF_PRIVATE; } -#if 0 +void wxDataFormat::SetId( const wxString& id ) +{ + PrepareFormats(); + m_type = wxDF_PRIVATE; + m_format = XInternAtom( wxGlobalDisplay(), + id.mbc_str(), False ); +} + +void wxDataFormat::PrepareFormats() +{ + if (!g_textAtom) + g_textAtom = XInternAtom( wxGlobalDisplay(), "STRING", False ); + if (!g_bitmapAtom) + g_bitmapAtom = XInternAtom( wxGlobalDisplay(), "PIXMAP", False ); + if (!g_fileAtom) + g_fileAtom = XInternAtom( wxGlobalDisplay(), "file:ALL", False ); +} // ---------------------------------------------------------------------------- -// wxPrivateDataObject +// wxDataObject // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS( wxPrivateDataObject, wxDataObject ) - -void wxPrivateDataObject::Free() +wxDataObject::~wxDataObject() { - if ( m_data ) - free(m_data); } -wxPrivateDataObject::wxPrivateDataObject() -{ - wxString id = wxT("application/"); - id += wxTheApp->GetAppName(); - - m_format.SetId( id ); +// ---------------------------------------------------------------------------- +// wxBitmapDataObject +// ---------------------------------------------------------------------------- - m_size = 0; - m_data = (void *)NULL; +size_t wxBitmapDataObject::GetDataSize() const +{ + return sizeof(Pixmap); } -void wxPrivateDataObject::SetData( const void *data, size_t size ) +bool wxBitmapDataObject::GetDataHere(void* buf) const { - Free(); + if( !GetBitmap().Ok() ) + return false; - m_size = size; - m_data = malloc(size); + (*(Pixmap*)buf) = (Pixmap)GetBitmap().GetDrawable(); - memcpy( m_data, data, size ); + return true; } -void wxPrivateDataObject::WriteData( void *dest ) const +bool wxBitmapDataObject::SetData(size_t len, const void* buf) { - WriteData( m_data, dest ); -} + if( len != sizeof(Pixmap) ) + return false; -size_t wxPrivateDataObject::GetSize() const -{ - return m_size; -} + WXPixmap pixmap = (WXPixmap)*(Pixmap*)buf; -void wxPrivateDataObject::WriteData( const void *data, void *dest ) const -{ - memcpy( dest, data, GetSize() ); -} + m_bitmap.Create( pixmap ); -#endif // 0 + return true; +} #endif // wxUSE_CLIPBOARD