X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1eaf587e21cd52294ea85a70a3906fc9f04307c7..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/motif/dataobj.cpp

diff --git a/src/motif/dataobj.cpp b/src/motif/dataobj.cpp
index 8f949396fc..0fd6bf384b 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,16 +7,17 @@
 // 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
@@ -25,14 +26,15 @@
 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif
-#include "wx/utils.h"
+
+#include "wx/motif/private.h"
 
 //-------------------------------------------------------------------------
 // global data
 //-------------------------------------------------------------------------
 
 Atom  g_textAtom        = 0;
-Atom  g_pngAtom         = 0;
+Atom  g_bitmapAtom      = 0;
 Atom  g_fileAtom        = 0;
 
 //-------------------------------------------------------------------------
@@ -59,12 +61,6 @@ wxDataFormat::wxDataFormat( wxDataFormatId type )
     SetType( type );
 }
 
-wxDataFormat::wxDataFormat( const wxChar *id )
-{
-    PrepareFormats();
-    SetId( id );
-}
-
 wxDataFormat::wxDataFormat( const wxString &id )
 {
     PrepareFormats();
@@ -86,7 +82,7 @@ void wxDataFormat::SetType( wxDataFormatId type )
         m_format = g_textAtom;
     else
     if (m_type == wxDF_BITMAP)
-        m_format = g_pngAtom;
+        m_format = g_bitmapAtom;
     else
     if (m_type == wxDF_FILENAME)
         m_format = g_fileAtom;
@@ -105,7 +101,7 @@ wxString wxDataFormat::GetId() const
 {
     char *t = XGetAtomName ((Display*) wxGetDisplay(), m_format);
     wxString ret( t );  // this will convert from ascii to Unicode
-    if (t) 
+    if (t)
         XFree( t );
     return ret;
 }
@@ -118,7 +114,7 @@ void wxDataFormat::SetId( NativeFormat format )
     if (m_format == g_textAtom)
         m_type = wxDF_TEXT;
     else
-    if (m_format == g_pngAtom)
+    if (m_format == g_bitmapAtom)
         m_type = wxDF_BITMAP;
     else
     if (m_format == g_fileAtom)
@@ -127,22 +123,22 @@ void wxDataFormat::SetId( NativeFormat format )
         m_type = wxDF_PRIVATE;
 }
 
-void wxDataFormat::SetId( const wxChar *id )
+void wxDataFormat::SetId( const wxString& id )
 {
     PrepareFormats();
     m_type = wxDF_PRIVATE;
-    wxString tmp( id );
-    m_format = XInternAtom( (Display*) wxGetDisplay(), wxMBSTRINGCAST tmp.mbc_str(), FALSE );  // what is the string cast for?
+    m_format = XInternAtom( wxGlobalDisplay(),
+                            id.mbc_str(), False );
 }
 
 void wxDataFormat::PrepareFormats()
 {
     if (!g_textAtom)
-        g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE );
-    if (!g_pngAtom)
-        g_pngAtom = XInternAtom( (Display*) wxGetDisplay(), "image/png", FALSE );
+        g_textAtom = XInternAtom( wxGlobalDisplay(), "STRING", False );
+    if (!g_bitmapAtom)
+        g_bitmapAtom = XInternAtom( wxGlobalDisplay(), "PIXMAP", False );
     if (!g_fileAtom)
-        g_fileAtom = XInternAtom( (Display*) wxGetDisplay(), "file:ALL", FALSE );
+        g_fileAtom = XInternAtom( wxGlobalDisplay(), "file:ALL", False );
 }
 
 // ----------------------------------------------------------------------------
@@ -153,56 +149,35 @@ wxDataObject::~wxDataObject()
 {
 }
 
-#if 0
-
 // ----------------------------------------------------------------------------
-// wxPrivateDataObject
+// wxBitmapDataObject
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS( wxPrivateDataObject, wxDataObject )
-
-void wxPrivateDataObject::Free()
+size_t wxBitmapDataObject::GetDataSize() const
 {
-    if ( m_data )
-        free(m_data);
+    return sizeof(Pixmap);
 }
 
-wxPrivateDataObject::wxPrivateDataObject()
+bool wxBitmapDataObject::GetDataHere(void* buf) const
 {
-    wxString id = wxT("application/");
-    id += wxTheApp->GetAppName();
+    if( !GetBitmap().IsOk() )
+        return false;
 
-    m_format.SetId( id );
+    (*(Pixmap*)buf) = (Pixmap)GetBitmap().GetDrawable();
 
-    m_size = 0;
-    m_data = (void *)NULL;
+    return true;
 }
 
-void wxPrivateDataObject::SetData( const void *data, size_t size )
+bool wxBitmapDataObject::SetData(size_t len, const void* buf)
 {
-    Free();
-
-    m_size = size;
-    m_data = malloc(size);
+    if( len != sizeof(Pixmap) )
+        return false;
 
-    memcpy( m_data, data, size );
-}
-
-void wxPrivateDataObject::WriteData( void *dest ) const
-{
-    WriteData( m_data, dest );
-}
+    WXPixmap pixmap = (WXPixmap)*(Pixmap*)buf;
 
-size_t wxPrivateDataObject::GetSize() const
-{
-    return m_size;
-}
+    m_bitmap.Create( pixmap );
 
-void wxPrivateDataObject::WriteData( const void *data, void *dest ) const
-{
-    memcpy( dest, data, GetSize() );
+    return true;
 }
 
-#endif // 0
-
 #endif // wxUSE_CLIPBOARD