removed obsolete file

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

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index e901b6ea57338cc732503d46303d8e916f278490..d5910702668eeaa07477555a3edca6adf4f4c8ef 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -152,15 +152,18 @@ wxDataObject::wxDataObject()
 bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
 {
     size_t nFormatCount = GetFormatCount(dir);
 bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
 {
     size_t nFormatCount = GetFormatCount(dir);

-    if ( nFormatCount == 1 ) {
+    if ( nFormatCount == 1 ) 
+    {

         return format == GetPreferredFormat();
     }
         return format == GetPreferredFormat();
     }

-    else {
+    else 
+    {

         wxDataFormat *formats = new wxDataFormat[nFormatCount];
         GetAllFormats(formats,dir);
 
         size_t n;
         wxDataFormat *formats = new wxDataFormat[nFormatCount];
         GetAllFormats(formats,dir);
 
         size_t n;

-        for ( n = 0; n < nFormatCount; n++ ) {
+        for ( n = 0; n < nFormatCount; n++ ) 
+        {

             if ( formats[n] == format )
                 break;
         }
             if ( formats[n] == format )
                 break;
         }


@@ -204,7 +207,7 @@ size_t wxFileDataObject::GetDataSize() const
     return res + 1;
 }
 
     return res + 1;
 }
 

-bool wxFileDataObject::SetData(size_t size, const void *buf)
+bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)

 {
     // VZ: old format
 #if 0
 {
     // VZ: old format
 #if 0


@@ -327,6 +330,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
 {
     Clear();
 
 {
     Clear();
 

+#if wxUSE_LIBPNG

     m_pngSize = size;
     m_pngData = malloc(m_pngSize);
 
     m_pngSize = size;
     m_pngData = malloc(m_pngSize);
 


@@ -343,10 +347,14 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
     m_bitmap = image.ConvertToBitmap();
 
     return m_bitmap.Ok();
     m_bitmap = image.ConvertToBitmap();
 
     return m_bitmap.Ok();

+#else
+    return FALSE;
+#endif

 }
 
 void wxBitmapDataObject::DoConvertToPng()
 {
 }
 
 void wxBitmapDataObject::DoConvertToPng()
 {

+#if wxUSE_LIBPNG

     if (!m_bitmap.Ok())
         return;
 
     if (!m_bitmap.Ok())
         return;
 


@@ -361,6 +369,7 @@ void wxBitmapDataObject::DoConvertToPng()
 
     wxMemoryOutputStream mstream( (char*) m_pngData, m_pngSize );
     handler.SaveFile( &image, mstream );
 
     wxMemoryOutputStream mstream( (char*) m_pngData, m_pngSize );
     handler.SaveFile( &image, mstream );

+#endif

 }
 
 
 }