added missing extern "C" required for Sun CC

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

diff --git a/src/os2/dataobj.cpp b/src/os2/dataobj.cpp
index 3763a035a12a02ab7752187a8c5b0a966d941b84..b6738a028d52d91da7128ac36f3f3dfded8f07ac 100644 (file)
--- a/src/os2/dataobj.cpp
+++ b/src/os2/dataobj.cpp
@@ -323,7 +323,7 @@ bool wxBitmapDataObject::SetData(
         return FALSE;
     }
 
         return FALSE;
     }
 

-    m_bitmap = vImage.ConvertToBitmap();
+    m_bitmap = wxBitmap(vImage);

 #endif //wxUSE_STREAMS
 
     return m_bitmap.Ok();
 #endif //wxUSE_STREAMS
 
     return m_bitmap.Ok();


@@ -335,7 +335,7 @@ void wxBitmapDataObject::DoConvertToPng()
         return;
 
 #if wxUSE_STREAMS
         return;
 
 #if wxUSE_STREAMS

-    wxImage                         vImage(m_bitmap);
+    wxImage                         vImage = m_bitmap.ConvertToImage();

     wxPNGHandler                    vHandler;
     wxCountingOutputStream          vCount;
 
     wxPNGHandler                    vHandler;
     wxCountingOutputStream          vCount;