Added wxCountingStream for measuring the size of streamed data

Added wxBitmapObject for putting it on the clipboard


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/gtk/dataobj.h

@@ -37,8 +37,6 @@ class wxFileDataObject;
 
 class wxDataFormat : public wxObject
 {
-    DECLARE_CLASS( wxDataFormat )
-
 public:
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
@@ -73,6 +71,11 @@ private:
     wxString    m_id;
     bool        m_hasAtom;
     GdkAtom     m_atom;
+    
+    void PrepareFormats();
+
+private:
+    DECLARE_CLASS( wxDataFormat )
 };
 
 //-------------------------------------------------------------------------
@@ -81,10 +84,7 @@ private:
 
 class wxDataBroker : public wxObject
 {
-  DECLARE_CLASS( wxDataBroker )
-
 public:
-
     /* constructor */
     wxDataBroker();
 
@@ -92,7 +92,6 @@ public:
     void Add( wxDataObject *dataObject, bool preferred = FALSE );
 
 private:
-
     /* OLE implementation, the methods don't need to be overridden */
 
     /* get number of supported formats */
@@ -113,12 +112,13 @@ private:
     /* search through m_dataObjects and call child's WriteData(dest) */
     virtual void WriteData( wxDataFormat& format, void *dest ) const;
 
-  /* implementation */
-
 public:
-
+    /* implementation */
     wxList    m_dataObjects;
     size_t    m_preferred;
+  
+private:
+    DECLARE_CLASS( wxDataBroker )
 };
 
 //----------------------------------------------------------------------------
@@ -127,10 +127,7 @@ public:
 
 class wxDataObject : public wxObject
 {
-  DECLARE_DYNAMIC_CLASS( wxDataObject )
-
 public:
-
     /* constructor */
     wxDataObject();
 
@@ -143,7 +140,9 @@ public:
     /* get size of data */
     virtual size_t GetSize() const = 0;
 
+public:
     /* implementation */
+    wxDataFormat m_format;
     
     wxDataFormat &GetFormat();
 
@@ -151,7 +150,8 @@ public:
     wxString   GetFormatId() const;
     GdkAtom    GetFormatAtom() const;
 
-  wxDataFormat m_format;
+private:
+    DECLARE_DYNAMIC_CLASS( wxDataObject )
 };
 
 //----------------------------------------------------------------------------
@@ -160,10 +160,7 @@ public:
 
 class wxTextDataObject : public wxDataObject
 {
-  DECLARE_DYNAMIC_CLASS( wxTextDataObject )
-
 public:
-
     /* default constructor. call SetText() later or override
        WriteData() and GetSize() for working on-demand */
     wxTextDataObject();
@@ -188,9 +185,12 @@ public:
     /* write string to dest */
     void WriteString( const wxString &str, void *dest ) const;
 
+public:
     /* implementation */
-
     wxString  m_data;
+
+private:
+    DECLARE_DYNAMIC_CLASS( wxTextDataObject )
 };
 
 //----------------------------------------------------------------------------
@@ -199,10 +199,7 @@ public:
 
 class wxFileDataObject : public wxDataObject
 {
-  DECLARE_DYNAMIC_CLASS( wxFileDataObject )
-
 public:
-
     /* default constructor */
     wxFileDataObject();
 
@@ -219,9 +216,12 @@ public:
     /* return length of list of filenames */
     virtual size_t GetSize() const;
 
+public:
     /* implementation */
-
     wxString  m_files;
+  
+private:
+    DECLARE_DYNAMIC_CLASS( wxFileDataObject )
 };
 
 //----------------------------------------------------------------------------
@@ -230,27 +230,32 @@ public:
 
 class wxBitmapDataObject : public wxDataObject
 {
-  DECLARE_DYNAMIC_CLASS( wxBitmapDataObject )
-
 public:
-
     /* see wxTextDataObject for explanation */
-
     wxBitmapDataObject();
     wxBitmapDataObject( const wxBitmap& bitmap );
+    ~wxBitmapDataObject();
 
     void SetBitmap( const wxBitmap &bitmap );
     wxBitmap GetBitmap() const;
 
     virtual void WriteData( void *dest ) const;
     virtual size_t GetSize() const;
+    void *GetData() const { return (void*)m_pngData; }
 
     void WriteBitmap( const wxBitmap &bitmap, void *dest ) const;
     
-  // implementation
+    void SetPngData( const char *pngData, size_t pngSize );
 
+private: 
     wxBitmap    m_bitmap;
+    size_t      m_pngSize;
+    char       *m_pngData;
   
+    void DoConvertToPng();
+ 
+private: 
+    DECLARE_DYNAMIC_CLASS( wxBitmapDataObject );
 };
 
 #endif

include/wx/gtk1/dataobj.h

@@ -37,8 +37,6 @@ class wxFileDataObject;
 
 class wxDataFormat : public wxObject
 {
-    DECLARE_CLASS( wxDataFormat )
-
 public:
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
@@ -73,6 +71,11 @@ private:
     wxString    m_id;
     bool        m_hasAtom;
     GdkAtom     m_atom;
+    
+    void PrepareFormats();
+
+private:
+    DECLARE_CLASS( wxDataFormat )
 };
 
 //-------------------------------------------------------------------------
@@ -81,10 +84,7 @@ private:
 
 class wxDataBroker : public wxObject
 {
-  DECLARE_CLASS( wxDataBroker )
-
 public:
-
     /* constructor */
     wxDataBroker();
 
@@ -92,7 +92,6 @@ public:
     void Add( wxDataObject *dataObject, bool preferred = FALSE );
 
 private:
-
     /* OLE implementation, the methods don't need to be overridden */
 
     /* get number of supported formats */
@@ -113,12 +112,13 @@ private:
     /* search through m_dataObjects and call child's WriteData(dest) */
     virtual void WriteData( wxDataFormat& format, void *dest ) const;
 
-  /* implementation */
-
 public:
-
+    /* implementation */
     wxList    m_dataObjects;
     size_t    m_preferred;
+  
+private:
+    DECLARE_CLASS( wxDataBroker )
 };
 
 //----------------------------------------------------------------------------
@@ -127,10 +127,7 @@ public:
 
 class wxDataObject : public wxObject
 {
-  DECLARE_DYNAMIC_CLASS( wxDataObject )
-
 public:
-
     /* constructor */
     wxDataObject();
 
@@ -143,7 +140,9 @@ public:
     /* get size of data */
     virtual size_t GetSize() const = 0;
 
+public:
     /* implementation */
+    wxDataFormat m_format;
     
     wxDataFormat &GetFormat();
 
@@ -151,7 +150,8 @@ public:
     wxString   GetFormatId() const;
     GdkAtom    GetFormatAtom() const;
 
-  wxDataFormat m_format;
+private:
+    DECLARE_DYNAMIC_CLASS( wxDataObject )
 };
 
 //----------------------------------------------------------------------------
@@ -160,10 +160,7 @@ public:
 
 class wxTextDataObject : public wxDataObject
 {
-  DECLARE_DYNAMIC_CLASS( wxTextDataObject )
-
 public:
-
     /* default constructor. call SetText() later or override
        WriteData() and GetSize() for working on-demand */
     wxTextDataObject();
@@ -188,9 +185,12 @@ public:
     /* write string to dest */
     void WriteString( const wxString &str, void *dest ) const;
 
+public:
     /* implementation */
-
     wxString  m_data;
+
+private:
+    DECLARE_DYNAMIC_CLASS( wxTextDataObject )
 };
 
 //----------------------------------------------------------------------------
@@ -199,10 +199,7 @@ public:
 
 class wxFileDataObject : public wxDataObject
 {
-  DECLARE_DYNAMIC_CLASS( wxFileDataObject )
-
 public:
-
     /* default constructor */
     wxFileDataObject();
 
@@ -219,9 +216,12 @@ public:
     /* return length of list of filenames */
     virtual size_t GetSize() const;
 
+public:
     /* implementation */
-
     wxString  m_files;
+  
+private:
+    DECLARE_DYNAMIC_CLASS( wxFileDataObject )
 };
 
 //----------------------------------------------------------------------------
@@ -230,27 +230,32 @@ public:
 
 class wxBitmapDataObject : public wxDataObject
 {
-  DECLARE_DYNAMIC_CLASS( wxBitmapDataObject )
-
 public:
-
     /* see wxTextDataObject for explanation */
-
     wxBitmapDataObject();
     wxBitmapDataObject( const wxBitmap& bitmap );
+    ~wxBitmapDataObject();
 
     void SetBitmap( const wxBitmap &bitmap );
     wxBitmap GetBitmap() const;
 
     virtual void WriteData( void *dest ) const;
     virtual size_t GetSize() const;
+    void *GetData() const { return (void*)m_pngData; }
 
     void WriteBitmap( const wxBitmap &bitmap, void *dest ) const;
     
-  // implementation
+    void SetPngData( const char *pngData, size_t pngSize );
 
+private: 
     wxBitmap    m_bitmap;
+    size_t      m_pngSize;
+    char       *m_pngData;
   
+    void DoConvertToPng();
+ 
+private: 
+    DECLARE_DYNAMIC_CLASS( wxBitmapDataObject );
 };
 
 #endif

include/wx/stream.h

@@ -136,6 +136,28 @@ class WXDLLEXPORT wxOutputStream: public wxStreamBase {
   wxOutputStream& operator<<( __wxOutputManip func) { return func(*this); }
 };
 
+// ---------------------------------------------------------------------------
+// A stream for measuring streamed output
+// ---------------------------------------------------------------------------
+
+class wxCountingOutputStream: public wxOutputStream {
+ public:
+  wxCountingOutputStream();
+
+  size_t GetSize() const;
+  bool Ok() const { return TRUE; }
+
+ protected:
+
+  size_t OnSysWrite(const void *buffer, size_t size);
+  off_t OnSysSeek(off_t pos, wxSeekMode mode);
+  off_t OnSysTell() const;
+
+ protected:
+  size_t m_currentPos;
+};
+
+
 // ---------------------------------------------------------------------------
 // "Filter" streams
 // ---------------------------------------------------------------------------

samples/dnd/Makefile.in

@@ -13,6 +13,8 @@ top_srcdir = @top_srcdir@
 top_builddir = ../..
 program_dir = samples/dnd
 
+DATAFILES=julian.png
+
 PROGRAM=dnd
 
 OBJECTS=$(PROGRAM).o

samples/dnd/dnd.cpp

@@ -19,22 +19,23 @@
 #include "wx/wx.h"
 #endif
 
+#ifdef __WXMOTIF__
+    #error Sorry, drag and drop is not yet implemented on wxMotif.
+#endif
+
 #include "wx/intl.h"
 #include "wx/log.h"
 
 #include "wx/dnd.h"
 #include "wx/dirdlg.h"
-
+#include "wx/filedlg.h"
-#ifdef __WXMOTIF__
+#include "wx/image.h"
-    #error Sorry, drag and drop is not yet implemented on wxMotif.
+#include "wx/clipbrd.h"
-#endif
 
 #if defined(__WXGTK__) || defined(__WXMOTIF__)
     #include "mondrian.xpm"
 #endif
 
-#include "wx/clipbrd.h"
-
 // ----------------------------------------------------------------------------
 // Derive two simple classes which just put in the listbox the strings (text or
 // file names) we drop on them
@@ -95,6 +96,10 @@ public:
     void OnLogClear(wxCommandEvent& event);
     void OnCopy(wxCommandEvent& event);
     void OnPaste(wxCommandEvent& event);
+    void OnCopyBitmap(wxCommandEvent& event);
+    void OnPasteBitmap(wxCommandEvent& event);
+    void OnClipboardHasText(wxCommandEvent& event);
+    void OnClipboardHasBitmap(wxCommandEvent& event);
 
     void OnLeftDown(wxMouseEvent& event);
     void OnRightDown(wxMouseEvent& event);
@@ -109,6 +114,7 @@ private:
     wxLog *m_pLog, *m_pLogPrev;
 
     wxString  m_strText;
+    wxBitmap  m_bitmap;
 };
 
 // ----------------------------------------------------------------------------
@@ -123,7 +129,11 @@ enum
     Menu_Help,
     Menu_Clear,
     Menu_Copy,
-    Menu_Paste
+    Menu_Paste,
+    Menu_CopyBitmap,
+    Menu_PasteBitmap,
+    Menu_HasText,
+    Menu_HasBitmap
 };
 
 BEGIN_EVENT_TABLE(DnDFrame, wxFrame)
@@ -134,6 +144,10 @@ BEGIN_EVENT_TABLE(DnDFrame, wxFrame)
     EVT_MENU(Menu_Clear,      DnDFrame::OnLogClear)
     EVT_MENU(Menu_Copy,       DnDFrame::OnCopy)
     EVT_MENU(Menu_Paste,      DnDFrame::OnPaste)
+    EVT_MENU(Menu_CopyBitmap, DnDFrame::OnCopyBitmap)
+    EVT_MENU(Menu_PasteBitmap,DnDFrame::OnPasteBitmap)
+    EVT_MENU(Menu_HasText,    DnDFrame::OnClipboardHasText)
+    EVT_MENU(Menu_HasBitmap,  DnDFrame::OnClipboardHasBitmap)
 
     EVT_LEFT_DOWN(            DnDFrame::OnLeftDown)
     EVT_RIGHT_DOWN(           DnDFrame::OnRightDown)
@@ -143,6 +157,10 @@ END_EVENT_TABLE()
     // `Main program' equivalent, creating windows and returning main app frame
 bool DnDApp::OnInit()
 {
+#if wxUSE_LIBPNG
+    wxImage::AddHandler( new wxPNGHandler );
+#endif
+
     // create the main frame window
     DnDFrame *frame = new DnDFrame((wxFrame  *) NULL,
                                    "Drag-and-Drop/Clipboard wxWindows Sample",
@@ -181,8 +199,14 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
     help_menu->Append(Menu_About, "&About");
 
     wxMenu *clip_menu = new wxMenu;
-    clip_menu->Append(Menu_Copy, "&Copy\tCtrl+C");
+    clip_menu->Append(Menu_Copy, "&Copy text\tCtrl+C");
-    clip_menu->Append(Menu_Paste, "&Paste\tCtrl+V");
+    clip_menu->Append(Menu_Paste, "&Paste text\tCtrl+V");
+    clip_menu->AppendSeparator();
+    clip_menu->Append(Menu_CopyBitmap, "&Copy bitmap");
+    clip_menu->Append(Menu_PasteBitmap, "&Paste bitmap");
+    clip_menu->AppendSeparator();
+    clip_menu->Append(Menu_HasText, "Clipboard has &text\tCtrl+T");
+    clip_menu->Append(Menu_HasBitmap, "Clipboard has a &bitmap\tCtrl+B");
     
     wxMenuBar *menu_bar = new wxMenuBar;
     menu_bar->Append(file_menu, "&File");
@@ -198,18 +222,15 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
 
     wxString strFile("Drop files here!"), strText("Drop text on me");
 
-    m_ctrlFile  = new wxListBox(this, -1, pos, size, 1, &strFile, wxLB_HSCROLL);
+    m_ctrlFile  = new wxListBox(this, -1, pos, size, 1, &strFile, wxLB_HSCROLL | wxLB_ALWAYS_SB );
-    m_ctrlText  = new wxListBox(this, -1, pos, size, 1, &strText, wxLB_HSCROLL);
+    m_ctrlText  = new wxListBox(this, -1, pos, size, 1, &strText, wxLB_HSCROLL | wxLB_ALWAYS_SB );
 
     m_ctrlLog   = new wxTextCtrl(this, -1, "", pos, size,
                                wxTE_MULTILINE | wxTE_READONLY |
                                wxSUNKEN_BORDER );
-
+    // redirect log messages to the text window (don't forget to delete it!)
-#if wxUSE_STD_IOSTREAM  
-// redirect log messages to the text window (don't forget to delete it!)
     m_pLog = new wxLogTextCtrl(m_ctrlLog);
     m_pLogPrev = wxLog::SetActiveTarget(m_pLog);
-#endif
 
     // associate drop targets with 2 text controls
     m_ctrlFile->SetDropTarget(new DnDFile(m_ctrlFile));
@@ -222,7 +243,7 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
     c->left.SameAs(this, wxLeft);
     c->top.SameAs(this, wxTop);
     c->right.PercentOf(this, wxRight, 50);
-  c->height.PercentOf(this, wxHeight, 40);
+    c->height.PercentOf(this, wxHeight, 30);
     m_ctrlFile->SetConstraints(c);
 
     // Top-right listbox
@@ -230,26 +251,26 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
     c->left.SameAs    (m_ctrlFile, wxRight);
     c->top.SameAs     (this, wxTop);
     c->right.SameAs   (this, wxRight);
-  c->height.PercentOf(this, wxHeight, 40);
+    c->height.PercentOf(this, wxHeight, 30);
     m_ctrlText->SetConstraints(c);
 
     // Lower text control
     c = new wxLayoutConstraints;
     c->left.SameAs    (this, wxLeft);
     c->right.SameAs   (this, wxRight);
-  c->height.PercentOf(this, wxHeight, 40);
+    c->height.PercentOf(this, wxHeight, 30);
     c->top.SameAs(m_ctrlText, wxBottom);
     m_ctrlLog->SetConstraints(c);
 
     SetAutoLayout(TRUE);
 }
 
-void DnDFrame::OnQuit(wxCommandEvent& /* event */)
+void DnDFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     Close(TRUE);
 }
 
-void DnDFrame::OnPaint(wxPaintEvent& /*event*/)
+void DnDFrame::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     int w = 0;
     int h = 0;
@@ -257,10 +278,55 @@ void DnDFrame::OnPaint(wxPaintEvent& /*event*/)
 
     wxPaintDC dc(this);
     dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL, FALSE, "charter" ) );
-    dc.DrawText( "Drag text from here!", 20, h-35 );
+    dc.DrawText( "Drag text from here!", 20, h-50 );
+    
+    if (m_bitmap.Ok())
+        dc.DrawBitmap( m_bitmap, 280, h-120, TRUE );
 }
 
-void DnDFrame::OnDrag(wxCommandEvent& /* event */)
+void DnDFrame::OnClipboardHasText(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !wxTheClipboard->Open() )
+    {
+        wxLogError( _T("Can't open clipboard.") );
+
+        return;
+    }
+
+    if ( !wxTheClipboard->IsSupported( wxDF_TEXT ) )
+    {
+        wxLogMessage( _T("No text is on the clipboard") );
+    }
+    else
+    {
+        wxLogMessage( _T("There is text is on the clipboard") );
+    }
+
+    wxTheClipboard->Close();
+}
+
+void DnDFrame::OnClipboardHasBitmap(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !wxTheClipboard->Open() )
+    {
+        wxLogError( _T("Can't open clipboard.") );
+
+        return;
+    }
+
+    if ( !wxTheClipboard->IsSupported( wxDF_BITMAP ) )
+    {
+        wxLogMessage( _T("No bitmap is on the clipboard") );
+    }
+    else
+    {
+        wxLogMessage( _T("A bitmap is on the clipboard") );
+    }
+
+    wxTheClipboard->Close();
+}
+
+void DnDFrame::OnDrag(wxCommandEvent& WXUNUSED(event))
 {
     wxString strText = wxGetTextFromUser
         (
@@ -274,7 +340,7 @@ void DnDFrame::OnDrag(wxCommandEvent& /* event */)
     m_strText = strText;
 }
 
-void DnDFrame::OnAbout(wxCommandEvent& /* event */)
+void DnDFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxMessageBox("Drag-&-Drop Demo\n"
                  "Please see \"Help|Help...\" for details\n"
@@ -357,16 +423,108 @@ void DnDFrame::OnRightDown(wxMouseEvent &event )
 
 DnDFrame::~DnDFrame()
 {
-#if wxUSE_STD_IOSTREAM  
     if ( m_pLog != NULL ) {
         if ( wxLog::SetActiveTarget(m_pLogPrev) == m_pLog )
             delete m_pLog;
     }
-#endif
 }
 
 // ---------------------------------------------------------------------------
-// clipboard
+// bitmap clipboard
+// ---------------------------------------------------------------------------
+
+void DnDFrame::OnCopyBitmap(wxCommandEvent& WXUNUSED(event))
+{
+    wxFileDialog dialog(this, "Open a PNG file", "", "", "PNG files (*.png)|*.png", 0);
+
+    if (dialog.ShowModal() != wxID_OK)
+    { 
+        wxLogMessage( _T("Aborted file open") );
+        return;
+    }
+    
+    if (dialog.GetPath().IsEmpty())
+    { 
+        wxLogMessage( _T("Returned empty string.") );
+        return;
+    }
+    
+    if (!wxFileExists(dialog.GetPath()))
+    {
+        wxLogMessage( _T("File doesn't exist.") );
+        return;
+    }
+    
+    wxImage image;
+    image.LoadFile( dialog.GetPath(), wxBITMAP_TYPE_PNG );
+    if (!image.Ok())
+    {
+        wxLogMessage( _T("Invalid image file...") );
+        return;
+    }
+    
+    wxLogMessage( _T("Decoding image file...") );
+    wxYield();
+    
+    wxBitmap bitmap( image.ConvertToBitmap() );
+
+    if ( !wxTheClipboard->Open() )
+    {
+        wxLogError(_T("Can't open clipboard."));
+
+        return;
+    }
+
+    wxLogMessage( _T("Creating wxBitmapDataObject...") );
+    wxYield();
+    
+    if ( !wxTheClipboard->AddData(new wxBitmapDataObject(bitmap)) )
+    {
+        wxLogError(_T("Can't copy image to the clipboard."));
+    }
+    else
+    {
+        wxLogMessage(_T("Image has been put on the clipboard.") );
+        wxLogMessage(_T("You can paste it now and look at it.") );
+    }
+
+    wxTheClipboard->Close();
+}
+
+void DnDFrame::OnPasteBitmap(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !wxTheClipboard->Open() )
+    {
+        wxLogError(_T("Can't open clipboard."));
+
+        return;
+    }
+
+    if ( !wxTheClipboard->IsSupported(wxDF_BITMAP) )
+    {
+        wxLogWarning(_T("No bitmap on clipboard"));
+
+        wxTheClipboard->Close();
+        return;
+    }
+
+    wxBitmapDataObject data;
+    if ( !wxTheClipboard->GetData(&data) )
+    {
+        wxLogError(_T("Can't paste bitmap from the clipboard"));
+    }
+    else
+    {
+        wxLogMessage(_T("Bitmap pasted from the clipboard") );
+	m_bitmap = data.GetBitmap();
+	Refresh();
+    }
+
+    wxTheClipboard->Close();
+}
+
+// ---------------------------------------------------------------------------
+// text clipboard
 // ---------------------------------------------------------------------------
 
 void DnDFrame::OnCopy(wxCommandEvent& WXUNUSED(event))
@@ -403,6 +561,7 @@ void DnDFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
     {
         wxLogWarning(_T("No text data on clipboard"));
 
+        wxTheClipboard->Close();
         return;
     }
 
@@ -423,6 +582,7 @@ void DnDFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
 // ----------------------------------------------------------------------------
 // Notifications called by the base class
 // ----------------------------------------------------------------------------
+
 bool DnDText::OnDropText( wxDropPointCoord, wxDropPointCoord, const wxChar *psz )
 {
     m_pOwner->Append(psz);

src/common/stream.cpp

@@ -645,9 +645,56 @@ wxOutputStream& wxOutputStream::operator<<(wxObject& obj)
 }
 #endif
 
+// ----------------------------------------------------------------------------
+// wxCountingOutputStream
+// ----------------------------------------------------------------------------
+
+wxCountingOutputStream::wxCountingOutputStream ()
+  : wxOutputStream()
+{
+   m_currentPos = 0;
+}
+
+size_t wxCountingOutputStream::GetSize() const
+{
+  return m_lastcount;
+}
+
+size_t wxCountingOutputStream::OnSysWrite(const void *buffer, size_t size)
+{
+  m_currentPos += size;
+  if (m_currentPos > m_lastcount) m_lastcount = m_currentPos;
+  return m_currentPos;
+}
+
+off_t wxCountingOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+{
+  if (mode == wxFromStart)
+  {
+    m_currentPos = pos;
+  }
+  if (mode == wxFromEnd)
+  {
+    m_currentPos = m_lastcount + pos;
+  }
+  else
+  {
+    m_currentPos += pos;
+  }
+  if (m_currentPos > m_lastcount) m_lastcount = m_currentPos;
+  
+  return m_currentPos;  // ?
+}
+
+off_t wxCountingOutputStream::OnSysTell() const
+{
+  return m_currentPos;  // ?
+}
+  
 // ----------------------------------------------------------------------------
 // wxFilterInputStream
 // ----------------------------------------------------------------------------
+
 wxFilterInputStream::wxFilterInputStream()
   : wxInputStream()
 {

src/gtk/clipbrd.cpp

@@ -178,12 +178,16 @@ selection_received( GtkWidget *WXUNUSED(widget),
 	
 	case wxDF_BITMAP:
 	{
-            if (selection_data->type != GDK_SELECTION_TYPE_BITMAP)
+            if (selection_data->type != GDK_SELECTION_TYPE_STRING)
             {
                 clipboard->m_waiting = FALSE;
                 return;
             }
 	    
+	    wxBitmapDataObject *bitmap_object = (wxBitmapDataObject *) data_object;
+	    
+	    bitmap_object->SetPngData( (const char*) selection_data->data, (size_t) selection_data->length );
+	    
 	    break;
 	}
 	
@@ -303,9 +307,16 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data
 	    
 	    case wxDF_BITMAP:
 	    {
-	        // wxBitmapDataObject *private_object = (wxBitmapDataObject*) data_object;
+	        wxBitmapDataObject *bitmap_object = (wxBitmapDataObject*) data_object;
 	    
-		// how do we do that ?
+	        if (bitmap_object->GetSize() == 0) return;
+	    
+                gtk_selection_data_set( 
+                    selection_data, 
+		    GDK_SELECTION_TYPE_STRING, 
+		    8*sizeof(gchar), 
+		    (unsigned char*) bitmap_object->GetData(), 
+		    (int) bitmap_object->GetSize() );
 		    
 		break;
 	    }

src/gtk/dataobj.cpp

@@ -14,6 +14,8 @@
 #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,7 +35,7 @@ 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;
@@ -40,25 +43,25 @@ wxDataFormat::wxDataFormat()
 
 wxDataFormat::wxDataFormat( wxDataFormatId type )
 {
-    if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE );
+    PrepareFormats();
     SetType( type );
 }
 
 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( 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;
@@ -67,7 +70,7 @@ wxDataFormat::wxDataFormat( const wxDataFormat &format )
 
 wxDataFormat::wxDataFormat( const GdkAtom atom )
 {
-    if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE );
+    PrepareFormats();
     m_hasAtom = TRUE;
 
     m_atom = atom;
@@ -102,7 +105,7 @@ void wxDataFormat::SetType( wxDataFormatId type )
     else
     if (m_type == wxDF_BITMAP)
     {
-        m_id = _T("BITMAP");
+        m_id = _T("image/png");
     }
     else
     if (m_type == wxDF_FILENAME)
@@ -169,6 +172,12 @@ GdkAtom wxDataFormat::GetAtom()
     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
 //-------------------------------------------------------------------------
@@ -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,12 +430,44 @@ 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 );
 }
 
 // ----------------------------------------------------------------------------

src/gtk1/clipbrd.cpp

@@ -178,12 +178,16 @@ selection_received( GtkWidget *WXUNUSED(widget),
 	
 	case wxDF_BITMAP:
 	{
-            if (selection_data->type != GDK_SELECTION_TYPE_BITMAP)
+            if (selection_data->type != GDK_SELECTION_TYPE_STRING)
             {
                 clipboard->m_waiting = FALSE;
                 return;
             }
 	    
+	    wxBitmapDataObject *bitmap_object = (wxBitmapDataObject *) data_object;
+	    
+	    bitmap_object->SetPngData( (const char*) selection_data->data, (size_t) selection_data->length );
+	    
 	    break;
 	}
 	
@@ -303,9 +307,16 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data
 	    
 	    case wxDF_BITMAP:
 	    {
-	        // wxBitmapDataObject *private_object = (wxBitmapDataObject*) data_object;
+	        wxBitmapDataObject *bitmap_object = (wxBitmapDataObject*) data_object;
 	    
-		// how do we do that ?
+	        if (bitmap_object->GetSize() == 0) return;
+	    
+                gtk_selection_data_set( 
+                    selection_data, 
+		    GDK_SELECTION_TYPE_STRING, 
+		    8*sizeof(gchar), 
+		    (unsigned char*) bitmap_object->GetData(), 
+		    (int) bitmap_object->GetSize() );
 		    
 		break;
 	    }

src/gtk1/dataobj.cpp

@@ -14,6 +14,8 @@
 #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,7 +35,7 @@ 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;
@@ -40,25 +43,25 @@ wxDataFormat::wxDataFormat()
 
 wxDataFormat::wxDataFormat( wxDataFormatId type )
 {
-    if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE );
+    PrepareFormats();
     SetType( type );
 }
 
 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( 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;
@@ -67,7 +70,7 @@ wxDataFormat::wxDataFormat( const wxDataFormat &format )
 
 wxDataFormat::wxDataFormat( const GdkAtom atom )
 {
-    if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE );
+    PrepareFormats();
     m_hasAtom = TRUE;
 
     m_atom = atom;
@@ -102,7 +105,7 @@ void wxDataFormat::SetType( wxDataFormatId type )
     else
     if (m_type == wxDF_BITMAP)
     {
-        m_id = _T("BITMAP");
+        m_id = _T("image/png");
     }
     else
     if (m_type == wxDF_FILENAME)
@@ -169,6 +172,12 @@ GdkAtom wxDataFormat::GetAtom()
     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
 //-------------------------------------------------------------------------
@@ -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,12 +430,44 @@ 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 );
 }
 
 // ----------------------------------------------------------------------------

utils/wxMMedia2/lib/cdbase.h

@@ -17,6 +17,8 @@
 
 #include "wx/wxprec.h"
 
+#include "wx/object.h"
+
 typedef struct wxCDtime {
   wxUint8 track;
   wxUint8 hour, min, sec;