Catching up to new common class interfaces.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-05 22:09:25 +00:00
parent 0f5fa11181
commit 3437f881c4
12 changed files with 585 additions and 351 deletions
--- a/src/os2/dataobj.cpp
+++ b/src/os2/dataobj.cpp
@@ -323,7 +323,7 @@ bool wxBitmapDataObject::SetData(
        return FALSE;
    }

-    m_bitmap = vImage.ConvertToBitmap();
+    m_bitmap = wxBitmap(vImage);
 #endif //wxUSE_STREAMS

    return m_bitmap.Ok();
@@ -335,7 +335,7 @@ void wxBitmapDataObject::DoConvertToPng()
        return;

 #if wxUSE_STREAMS
-    wxImage                         vImage(m_bitmap);
+    wxImage                         vImage = m_bitmap.ConvertToImage();
    wxPNGHandler                    vHandler;
    wxCountingOutputStream          vCount;