more 64 bit correctness fixes

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

diff --git a/src/os2/clipbrd.cpp b/src/os2/clipbrd.cpp
index 2618dc688536171494dbff10719574db76716e43..efb52d4ea3f99ff72fa3ef7322a2819cbefd3e24 100644 (file)
--- a/src/os2/clipbrd.cpp
+++ b/src/os2/clipbrd.cpp
@@ -44,7 +44,7 @@
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dataobj.h"
 
-    static bool wxSetClipboardData(wxDataObject *data);
+//    static bool wxSetClipboardData(wxDataObject *data);
 #endif
 
 // ===========================================================================
@@ -124,6 +124,7 @@ bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
     return FALSE;
 }
 
+#if 0
 #if wxUSE_DRAG_AND_DROP
 static bool wxSetClipboardData(wxDataObject *data)
 {
@@ -157,6 +158,7 @@ static bool wxSetClipboardData(wxDataObject *data)
     return TRUE;
 }
 #endif // wxUSE_DRAG_AND_DROP
+#endif
 
 bool wxSetClipboardData(wxDataFormat dataFormat,
                         const void *data,
@@ -281,7 +283,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
 
 void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 {
-    void *retval = NULL;
+//  void *retval = NULL;
 // TODO:
 /*
     switch ( dataFormat )
@@ -481,7 +483,7 @@ bool wxClipboard::AddData( wxDataObject *data )
 #if wxUSE_DRAG_AND_DROP
     wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
 
-//    wxDataFormat format = data->GetFormat();
+//    wxDataFormat format = data->GetPreferredFormat();
 // TODO:
 /*
     switch ( format )
@@ -499,7 +501,7 @@ bool wxClipboard::AddData( wxDataObject *data )
         {
             wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data;
             wxBitmap bitmap(bitmapDataObject->GetBitmap());
-            return wxSetClipboardData(data->GetFormat(), &bitmap);
+            return wxSetClipboardData(data->GetPreferredFormat(), &bitmap);
         }
 
 #if wxUSE_METAFILE
@@ -530,7 +532,7 @@ void wxClipboard::Close()
     wxCloseClipboard();
 }
 
-bool wxClipboard::IsSupported( wxDataFormat format )
+bool wxClipboard::IsSupported( const wxDataFormat& format )
 {
     return wxIsClipboardFormatAvailable(format);
 }
@@ -540,7 +542,7 @@ bool wxClipboard::GetData( wxDataObject& data )
     wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
 
 #if wxUSE_DRAG_AND_DROP
-//    wxDataFormat format = data.GetFormat();
+//    wxDataFormat format = data.GetPreferredFormat();
     // TODO:
 /*
     switch ( format )
@@ -564,7 +566,7 @@ bool wxClipboard::GetData( wxDataObject& data )
         case wxDF_DIB:
         {
             wxBitmapDataObject& bitmapDataObject = (wxBitmapDataObject &)data;
-            wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data->GetFormat());
+            wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data->GetPreferredFormat());
             if (bitmap)
             {
                 bitmapDataObject.SetBitmap(* bitmap);