wxSlider should now display int values,

[wxWidgets.git] / src / gtk1 / dataobj.cpp

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index a3ed60aa983ac693f9db3e897f55abbc8bce909b..643d09aa7675c341a65150ff21e9b2bec22028cb 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -4,476 +4,288 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "dataobj.h"
+    #pragma implementation "dataobj.h"

 #endif
 
 #include "wx/dataobj.h"
 #include "wx/app.h"
 #include "wx/debug.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"
 
 
 #include "gdk/gdk.h"
 

-

 //-------------------------------------------------------------------------
 // global data
 //-------------------------------------------------------------------------
 
 GdkAtom  g_textAtom        = 0;
 //-------------------------------------------------------------------------
 // global data
 //-------------------------------------------------------------------------
 
 GdkAtom  g_textAtom        = 0;

+GdkAtom  g_pngAtom         = 0;
+GdkAtom  g_fileAtom        = 0;

 
 //-------------------------------------------------------------------------
 // wxDataFormat
 //-------------------------------------------------------------------------
 
 
 //-------------------------------------------------------------------------
 // wxDataFormat
 //-------------------------------------------------------------------------
 

-IMPLEMENT_CLASS(wxDataFormat, wxObject)
-

 wxDataFormat::wxDataFormat()
 {
 wxDataFormat::wxDataFormat()
 {

-    if (!g_textAtom) g_textAtom = gdk_atom_intern( "TEXT", FALSE );
+    PrepareFormats();

     m_type = wxDF_INVALID;
     m_type = wxDF_INVALID;

-    m_hasAtom = FALSE;
-    m_atom = (GdkAtom) 0;
+    m_format = (GdkAtom) 0;

 }
 
 }
 

-wxDataFormat::wxDataFormat( wxDataType type )
+wxDataFormat::wxDataFormat( wxDataFormatId type )

 {
 {

-    if (!g_textAtom) g_textAtom = gdk_atom_intern( "TEXT", FALSE );
+    PrepareFormats();

     SetType( type );
 }
 
     SetType( type );
 }
 

-wxDataFormat::wxDataFormat( const wxString &id )
+wxDataFormat::wxDataFormat( const wxChar *id )

 {
 {

-    if (!g_textAtom) g_textAtom = gdk_atom_intern( "TEXT", FALSE );
+    PrepareFormats();

     SetId( id );
 }
 
     SetId( id );
 }
 

-wxDataFormat::wxDataFormat( wxDataFormat &format )
+wxDataFormat::wxDataFormat( const wxString &id )

 {
 {

-    if (!g_textAtom) g_textAtom = gdk_atom_intern( "TEXT", FALSE );
-    m_type = format.GetType();
-    m_id = format.GetId();
-    m_hasAtom = TRUE;
-    m_atom = format.GetAtom();
+    PrepareFormats();
+    SetId( id );

 }
 
 }
 

-wxDataFormat::wxDataFormat( const GdkAtom atom )
+wxDataFormat::wxDataFormat( NativeFormat format )

 {
 {

-    if (!g_textAtom) g_textAtom = gdk_atom_intern( "TEXT", 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 = gdk_atom_name( m_atom );
-       
-       if (m_id == "file:ALL")
-       {
-           m_type = wxDF_FILENAME;
-       }
-    }
+    PrepareFormats();
+    SetId( format );

 }
 
 }
 

-void wxDataFormat::SetType( wxDataType type )
+void wxDataFormat::SetType( wxDataFormatId type )

 {
     m_type = type;
 {
     m_type = type;

-    
+

     if (m_type == wxDF_TEXT)
     if (m_type == wxDF_TEXT)

-    {
-        m_id = "TEXT";
-    } 
+        m_format = g_textAtom;

     else
     if (m_type == wxDF_BITMAP)
     else
     if (m_type == wxDF_BITMAP)

-    {
-        m_id = "BITMAP";
-    } 
+        m_format = g_pngAtom;

     else
     if (m_type == wxDF_FILENAME)
     else
     if (m_type == wxDF_FILENAME)

-    {
-        m_id = "file:ALL";
-    }
+        m_format = g_fileAtom;

     else
     {
     else
     {

-       wxFAIL_MSG( "invalid dataformat" );
+       wxFAIL_MSG( wxT("invalid dataformat") );

     }
     }

-    
-    m_hasAtom = FALSE;

 }
 }

-  
-wxDataType wxDataFormat::GetType() const
+
+wxDataFormatId wxDataFormat::GetType() const

 {
     return m_type;
 }
 
 wxString wxDataFormat::GetId() const
 {
 {
     return m_type;
 }
 
 wxString wxDataFormat::GetId() const
 {

-    return m_id;
-}
-
-void wxDataFormat::SetId( const wxString &id )
-{
-    m_type = wxDF_PRIVATE;
-    m_id = id;
-    m_hasAtom = FALSE;
+    wxString ret( gdk_atom_name( m_format ) );  // this will convert from ascii to Unicode
+    return ret;

 }
 
 }
 

-GdkAtom 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 = gdk_atom_intern( WXSTRINGCAST( m_id ), 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;
-}
-
-//-------------------------------------------------------------------------
-// wxDataBroker
-//-------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxDataBroker,wxObject)
-
-wxDataBroker::wxDataBroker() 
-{ 
-    m_dataObjects.DeleteContents(TRUE);
-    m_preferred = 0;
-}
+    m_format = format;

 
 

-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(); 
-}
-    
-wxDataFormat &wxDataBroker::GetPreferredFormat() const
-{ 
-    wxNode *node = m_dataObjects.Nth( m_preferred );
-    
-    wxASSERT( node );
-    
-    wxDataObject* data_obj = (wxDataObject*)node->Data();
-    
-    return data_obj->GetFormat();
+    if (m_format == g_textAtom)
+        m_type = wxDF_TEXT;
+    else
+    if (m_format == g_pngAtom)
+        m_type = wxDF_BITMAP;
+    else
+    if (m_format == g_fileAtom)
+        m_type = wxDF_FILENAME;
+    else
+        m_type = wxDF_PRIVATE;

 }
 }

-    
-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
+void wxDataFormat::SetId( const wxChar *id )

 {
 {

-    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;
+    m_type = wxDF_PRIVATE;
+    wxString tmp( id );
+    m_format = gdk_atom_intern( wxMBSTRINGCAST tmp.mbc_str(), FALSE );  // what is the string cast for?

 }
 }

-    
-void wxDataBroker::WriteData( wxDataFormat& format, void *dest ) const
+
+void wxDataFormat::PrepareFormats()

 {
 {

-    wxNode *node = m_dataObjects.First();
-    while (node)
-    {
-        wxDataObject *dobj = (wxDataObject*)node->Data();
-       
-       if (dobj->GetFormat().GetAtom() == format.GetAtom())
-       {
-           dobj->WriteData( dest );
-       }
-    
-        node = node->Next();
-    }
+    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 );

 }
 
 //-------------------------------------------------------------------------
 // wxDataObject
 //-------------------------------------------------------------------------
 
 }
 
 //-------------------------------------------------------------------------
 // wxDataObject
 //-------------------------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS( wxDataObject, wxObject )
-

 wxDataObject::wxDataObject()
 {
 }
 wxDataObject::wxDataObject()
 {
 }

-  
-wxDataObject::~wxDataObject()
-{
-}

 
 

-wxDataFormat &wxDataObject::GetFormat()
+bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const

 {
 {

-    return m_format;
-}
+    size_t nFormatCount = GetFormatCount(dir);
+    if ( nFormatCount == 1 ) {
+        return format == GetPreferredFormat();
+    }
+    else {
+        wxDataFormat *formats = new wxDataFormat[nFormatCount];
+        GetAllFormats(formats,dir);
+
+        size_t n;
+        for ( n = 0; n < nFormatCount; n++ ) {
+            if ( formats[n] == format )
+                break;
+        }

 
 

-wxDataType wxDataObject::GetFormatType() const
-{
-    return m_format.GetType();
-}
+        delete [] formats;

 
 

-wxString wxDataObject::GetFormatId() const
-{
-    return m_format.GetId();
+        // found?
+        return n < nFormatCount;
+    }

 }
 
 }
 

-GdkAtom wxDataObject::GetFormatAtom() const
-{
-    GdkAtom ret = ((wxDataObject*) this)->m_format.GetAtom();
-    return ret;
-}  
-

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// wxTextDataObject
+// wxFileDataObject

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS( wxTextDataObject, wxDataObject )
-
-wxTextDataObject::wxTextDataObject()
+bool wxFileDataObject::GetDataHere(void *buf) const

 {
 {

-    m_format.SetType( wxDF_TEXT );
-}
-
-wxTextDataObject::wxTextDataObject( const wxString& data )
-{
-    m_format.SetType( wxDF_TEXT );
+    wxString filenames;

     
     

-    m_data = data;
-}
-
-void wxTextDataObject::SetText( const wxString& data ) 
-{
-    m_data = data;
-}
-
-wxString wxTextDataObject::GetText() const
-{
-    return m_data;
-}
+    for (size_t i = 0; i < m_filenames.GetCount(); i++)
+    {
+        filenames += m_filenames[i];
+       filenames += (wxChar) 0;
+    }
+    
+    memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );

 
 

-void wxTextDataObject::WriteData( void *dest ) const
-{
-    WriteString( m_data, dest );
+    return TRUE;

 }
 
 }
 

-size_t wxTextDataObject::GetSize() const
+size_t wxFileDataObject::GetDataSize() const

 {
 {

-    return m_data.Len() + 1;
+    size_t res = 0;
+    
+    for (size_t i = 0; i < m_filenames.GetCount(); i++)
+    {
+        res += m_filenames[i].Len();
+       res += 1;
+    }
+    
+    return res + 1;

 }
 
 }
 

-void wxTextDataObject::WriteString( const wxString &str, void *dest ) const
+bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)

 {
 {

-    memcpy( dest, m_data.c_str(), GetSize() );
-}
+    /* TODO */

     
     

-// ----------------------------------------------------------------------------
-// wxFileDataObject
-// ----------------------------------------------------------------------------
+    wxString file( (const char *)buf );  /* char, not wxChar */

 
 

-IMPLEMENT_DYNAMIC_CLASS( wxFileDataObject, wxDataObject )
+    AddFile( file );

 
 

-wxFileDataObject::wxFileDataObject()
-{
-    m_format.SetType( wxDF_FILENAME );
+    return TRUE;

 }
 
 }
 

-void wxFileDataObject::AddFile( const wxString &file )
-{ 
-    m_files += file; 
-    m_files += (char)0; 
-}
-    
-wxString wxFileDataObject::GetFiles() const
-{ 
-    return m_files; 
-}
-    
-void wxFileDataObject::WriteData( void *dest ) const
-{
-    memcpy( dest, m_files.c_str(), GetSize() );
-}
- 
-size_t wxFileDataObject::GetSize() const
+void wxFileDataObject::AddFile( const wxString &filename )

 {
 {

-    return m_files.Len() + 1;
+   m_filenames.Add( filename );

 }
 }

-  
+

 // ----------------------------------------------------------------------------
 // wxBitmapDataObject
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxBitmapDataObject
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS( wxBitmapDataObject, wxDataObject )
-

 wxBitmapDataObject::wxBitmapDataObject()
 {
 wxBitmapDataObject::wxBitmapDataObject()
 {

-    m_format.SetType( wxDF_BITMAP );
+    Init();

 }
 
 wxBitmapDataObject::wxBitmapDataObject( const wxBitmap& bitmap )
 }
 
 wxBitmapDataObject::wxBitmapDataObject( const wxBitmap& bitmap )

+                  : wxBitmapDataObjectBase(bitmap)

 {
 {

-    m_format.SetType( wxDF_BITMAP );
-    
-    m_bitmap = bitmap;
-}
+    Init();

 
 

-void wxBitmapDataObject::SetBitmap( const wxBitmap &bitmap )
-{
-    m_bitmap = bitmap;
+    DoConvertToPng();

 }
 
 }
 

-wxBitmap wxBitmapDataObject::GetBitmap() const
+wxBitmapDataObject::~wxBitmapDataObject()

 {
 {

-    return m_bitmap;
+    Clear();

 }
 
 }
 

-void wxBitmapDataObject::WriteData( void *dest ) const
+void wxBitmapDataObject::SetBitmap( const wxBitmap &bitmap )

 {
 {

-    WriteBitmap( m_bitmap, dest );
+    ClearAll();
+
+    wxBitmapDataObjectBase::SetBitmap(bitmap);
+
+    DoConvertToPng();

 }
 
 }
 

-size_t wxBitmapDataObject::GetSize() const
+bool wxBitmapDataObject::GetDataHere(void *buf) const

 {
 {

-    return 0;
+    if ( !m_pngSize )
+    {
+        wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") );
+
+        return FALSE;
+    }
+
+    memcpy(buf, m_pngData, m_pngSize);
+
+    return TRUE;

 }
 
 }
 

-void wxBitmapDataObject::WriteBitmap( const wxBitmap &bitmap, void *dest ) const
+bool wxBitmapDataObject::SetData(size_t size, const void *buf)

 {
 {

-    memcpy( dest, m_bitmap.GetPixmap(), GetSize() );
-}
-    
-// ----------------------------------------------------------------------------
-// wxPrivateDataObject
-// ----------------------------------------------------------------------------
+    Clear();

 
 

-IMPLEMENT_DYNAMIC_CLASS( wxPrivateDataObject, wxDataObject )
+    m_pngSize = size;
+    m_pngData = malloc(m_pngSize);

 
 

-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 );
-}
+    memcpy( m_pngData, buf, m_pngSize );
+
+    wxMemoryInputStream mstream( (char*) m_pngData, m_pngSize );
+    wxImage image;
+    wxPNGHandler handler;
+    if ( !handler.LoadFile( &image, mstream ) )
+    {
+        return FALSE;
+    }
+
+    m_bitmap = image.ConvertToBitmap();

     
     

-wxString wxPrivateDataObject::GetId() const
-{ 
-    return m_id; 
+    return m_bitmap.Ok();

 }
 
 }
 

-void wxPrivateDataObject::SetData( const char *data, size_t size )
+void wxBitmapDataObject::DoConvertToPng()

 {
 {

-    m_size = size;
-    
-    if (m_data) delete[] m_data;
-    
-    m_data = new char[size];
+    if (!m_bitmap.Ok())
+        return;

 
 

-    memcpy( m_data, data, size );  
-}
+    wxImage image( m_bitmap );
+    wxPNGHandler handler;

 
 

-char* wxPrivateDataObject::GetData() const
-{
-    return m_data;
-}
+    wxCountingOutputStream count;
+    handler.SaveFile( &image, count );

 
 

-void wxPrivateDataObject::WriteData( void *dest ) const
-{
-    WriteData( m_data, dest );
-}
+    m_pngSize = count.GetSize() + 100; // sometimes the size seems to vary ???
+    m_pngData = malloc(m_pngSize);

 
 

-size_t wxPrivateDataObject::GetSize() const
-{
-   return m_size;
+    wxMemoryOutputStream mstream( (char*) m_pngData, m_pngSize );
+    handler.SaveFile( &image, mstream );

 }
 
 }
 

-void wxPrivateDataObject::WriteData( const char *data, void *dest ) const
-{
-    memcpy( dest, data, GetSize() );
-}