correcting include type

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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 7802a92ac8de37bd35cf81c49e3c6f5abfb0f65f..cd848901bdef147aa096158f0ca33868c97ae08b 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -87,11 +87,11 @@
 // old-style clipboard functions using Windows API
 // ---------------------------------------------------------------------------
 
 // old-style clipboard functions using Windows API
 // ---------------------------------------------------------------------------
 

-static bool gs_wxClipboardIsOpen = FALSE;
+static bool gs_wxClipboardIsOpen = false;

 
 bool wxOpenClipboard()
 {
 
 bool wxOpenClipboard()
 {

-    wxCHECK_MSG( !gs_wxClipboardIsOpen, TRUE, wxT("clipboard already opened.") );
+    wxCHECK_MSG( !gs_wxClipboardIsOpen, true, wxT("clipboard already opened.") );

 
     wxWindow *win = wxTheApp->GetTopWindow();
     if ( win )
 
     wxWindow *win = wxTheApp->GetTopWindow();
     if ( win )


@@ -107,24 +107,24 @@ bool wxOpenClipboard()
     {
         wxLogDebug(wxT("Can not open clipboard without a main window."));
 
     {
         wxLogDebug(wxT("Can not open clipboard without a main window."));
 

-        return FALSE;
+        return false;

     }
 }
 
 bool wxCloseClipboard()
 {
     }
 }
 
 bool wxCloseClipboard()
 {

-    wxCHECK_MSG( gs_wxClipboardIsOpen, FALSE, wxT("clipboard is not opened") );
+    wxCHECK_MSG( gs_wxClipboardIsOpen, false, wxT("clipboard is not opened") );

 
 

-    gs_wxClipboardIsOpen = FALSE;
+    gs_wxClipboardIsOpen = false;

 
     if ( ::CloseClipboard() == 0 )
     {
         wxLogSysError(_("Failed to close the clipboard."));
 
 
     if ( ::CloseClipboard() == 0 )
     {
         wxLogSysError(_("Failed to close the clipboard."));
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxEmptyClipboard()
 }
 
 bool wxEmptyClipboard()


@@ -133,10 +133,10 @@ bool wxEmptyClipboard()
     {
         wxLogSysError(_("Failed to empty the clipboard."));
 
     {
         wxLogSysError(_("Failed to empty the clipboard."));
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxIsClipboardOpened()
 }
 
 bool wxIsClipboardOpened()


@@ -146,26 +146,28 @@ bool wxIsClipboardOpened()
 
 bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
 {
 
 bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
 {

-    if ( ::IsClipboardFormatAvailable(dataFormat) )
+   wxDataFormat::NativeFormat cf = dataFormat.GetFormatId();
+
+    if ( ::IsClipboardFormatAvailable(cf) )

     {
         // ok from the first try
     {
         // ok from the first try

-        return TRUE;
+        return true;

     }
 
     // for several standard formats, we can convert from some other ones too
     }
 
     // for several standard formats, we can convert from some other ones too

-    switch ( dataFormat.GetFormatId() )
+    switch ( cf )

     {
         // for bitmaps, DIBs will also do
         case CF_BITMAP:
             return ::IsClipboardFormatAvailable(CF_DIB) != 0;
 
     {
         // for bitmaps, DIBs will also do
         case CF_BITMAP:
             return ::IsClipboardFormatAvailable(CF_DIB) != 0;
 

-#if wxUSE_ENH_METAFILE && !defined(__WIN16__) && !defined(__WXWINCE__)
+#if wxUSE_ENH_METAFILE && !defined(__WXWINCE__)

         case CF_METAFILEPICT:
             return ::IsClipboardFormatAvailable(CF_ENHMETAFILE) != 0;
 #endif // wxUSE_ENH_METAFILE
 
         default:
         case CF_METAFILEPICT:
             return ::IsClipboardFormatAvailable(CF_ENHMETAFILE) != 0;
 #endif // wxUSE_ENH_METAFILE
 
         default:

-            return FALSE;
+            return false;

     }
 }
 
     }
 }
 


@@ -194,7 +196,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                     SelectObject(hdcSrc, old);
                     DeleteDC(hdcMem);
                     DeleteDC(hdcSrc);
                     SelectObject(hdcSrc, old);
                     DeleteDC(hdcMem);
                     DeleteDC(hdcSrc);

-                    return FALSE;
+                    return false;

                 }
 
                 HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hBitmap);
                 }
 
                 HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hBitmap);


@@ -219,10 +221,13 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
             {
                 wxBitmap *bitmap = (wxBitmap *)data;
 
             {
                 wxBitmap *bitmap = (wxBitmap *)data;
 

-                HGLOBAL hDIB = wxDIB::ConvertFromBitmap(GetHbitmapOf(*bitmap));
-                if ( hDIB )
+                if ( bitmap && bitmap->Ok() )

                 {
                 {

-                    handle = ::SetClipboardData(CF_DIB, hDIB);
+                    wxDIB dib(*bitmap);
+                    if ( dib.IsOk() )
+                    {
+                        handle = ::SetClipboardData(CF_DIB, dib.Detach());
+                    }

                 }
                 break;
             }
                 }
                 break;
             }


@@ -250,7 +255,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
             }
 #endif // wxUSE_METAFILE
 
             }
 #endif // wxUSE_METAFILE
 

-#if wxUSE_ENH_METAFILE && !defined(__WIN16__) && !defined(__WXWINCE__)
+#if wxUSE_ENH_METAFILE && !defined(__WXWINCE__)

         case wxDF_ENHMETAFILE:
             {
                 wxEnhMetaFile *emf = (wxEnhMetaFile *)data;
         case wxDF_ENHMETAFILE:
             {
                 wxEnhMetaFile *emf = (wxEnhMetaFile *)data;


@@ -269,7 +274,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
         default:
             {
                 wxLogError(_("Unsupported clipboard format."));
         default:
             {
                 wxLogError(_("Unsupported clipboard format."));

-                return FALSE;
+                return false;

             }
 
         case wxDF_OEMTEXT:
             }
 
         case wxDF_OEMTEXT:


@@ -301,15 +306,15 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
         case wxDF_HTML:
             {
                 char* html = (char *)data;
         case wxDF_HTML:
             {
                 char* html = (char *)data;

-                
+

                 // Create temporary buffer for HTML header...
                 char *buf = new char [400 + strlen(html)];
                 // Create temporary buffer for HTML header...
                 char *buf = new char [400 + strlen(html)];

-                if(!buf) return FALSE;
-                
+                if(!buf) return false;
+

                 // Get clipboard id for HTML format...
                 static int cfid = 0;
                 if(!cfid) cfid = RegisterClipboardFormat(wxT("HTML Format"));
                 // Get clipboard id for HTML format...
                 static int cfid = 0;
                 if(!cfid) cfid = RegisterClipboardFormat(wxT("HTML Format"));

-                
+

                 // Create a template string for the HTML header...
                 strcpy(buf,
                     "Version:0.9\r\n"
                 // Create a template string for the HTML header...
                 strcpy(buf,
                     "Version:0.9\r\n"


@@ -319,7 +324,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                     "EndFragment:00000000\r\n"
                     "<html><body>\r\n"
                     "<!--StartFragment -->\r\n");
                     "EndFragment:00000000\r\n"
                     "<html><body>\r\n"
                     "<!--StartFragment -->\r\n");

-                
+

                 // Append the HTML...
                 strcat(buf, html);
                 strcat(buf, "\r\n");
                 // Append the HTML...
                 strcat(buf, html);
                 strcat(buf, "\r\n");


@@ -328,7 +333,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                     "<!--EndFragment-->\r\n"
                     "</body>\r\n"
                     "</html>");
                     "<!--EndFragment-->\r\n"
                     "</body>\r\n"
                     "</html>");

-                
+

                 // Now go back, calculate all the lengths, and write out the
                 // necessary header information. Note, wsprintf() truncates the
                 // string when you overwrite it so you follow up with code to replace
                 // Now go back, calculate all the lengths, and write out the
                 // necessary header information. Note, wsprintf() truncates the
                 // string when you overwrite it so you follow up with code to replace


@@ -336,35 +341,35 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                 char *ptr = strstr(buf, "StartHTML");
                 wsprintf(ptr+10, "%08u", strstr(buf, "<html>") - buf);
                 *(ptr+10+8) = '\r';
                 char *ptr = strstr(buf, "StartHTML");
                 wsprintf(ptr+10, "%08u", strstr(buf, "<html>") - buf);
                 *(ptr+10+8) = '\r';

-                
+

                 ptr = strstr(buf, "EndHTML");
                 wsprintf(ptr+8, "%08u", strlen(buf));
                 *(ptr+8+8) = '\r';
                 ptr = strstr(buf, "EndHTML");
                 wsprintf(ptr+8, "%08u", strlen(buf));
                 *(ptr+8+8) = '\r';

-                
+

                 ptr = strstr(buf, "StartFragment");
                 wsprintf(ptr+14, "%08u", strstr(buf, "<!--StartFrag") - buf);
                 *(ptr+14+8) = '\r';
                 ptr = strstr(buf, "StartFragment");
                 wsprintf(ptr+14, "%08u", strstr(buf, "<!--StartFrag") - buf);
                 *(ptr+14+8) = '\r';

-                
+

                 ptr = strstr(buf, "EndFragment");
                 wsprintf(ptr+12, "%08u", strstr(buf, "<!--EndFrag") - buf);
                 *(ptr+12+8) = '\r';
                 ptr = strstr(buf, "EndFragment");
                 wsprintf(ptr+12, "%08u", strstr(buf, "<!--EndFrag") - buf);
                 *(ptr+12+8) = '\r';

-                
+

                 // Now you have everything in place ready to put on the
                 // clipboard.
                 // Now you have everything in place ready to put on the
                 // clipboard.

-                
+

                 // Allocate global memory for transfer...
                 HGLOBAL hText = GlobalAlloc(GMEM_MOVEABLE |GMEM_DDESHARE, strlen(buf)+4);
                 // Allocate global memory for transfer...
                 HGLOBAL hText = GlobalAlloc(GMEM_MOVEABLE |GMEM_DDESHARE, strlen(buf)+4);

-                
+

                 // Put your string in the global memory...
                 ptr = (char *)GlobalLock(hText);
                 strcpy(ptr, buf);
                 GlobalUnlock(hText);
                 // Put your string in the global memory...
                 ptr = (char *)GlobalLock(hText);
                 strcpy(ptr, buf);
                 GlobalUnlock(hText);

-                
+

                 handle = ::SetClipboardData(cfid, hText);
                 handle = ::SetClipboardData(cfid, hText);

-                
+

                 // Free memory...
                 GlobalFree(hText);
                 // Free memory...
                 GlobalFree(hText);

-                
+

                 // Clean up...
                 delete [] buf;
                 break;
                 // Clean up...
                 delete [] buf;
                 break;


@@ -376,10 +381,10 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
     {
         wxLogSysError(_("Failed to set clipboard data."));
 
     {
         wxLogSysError(_("Failed to set clipboard data."));
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 }
 
 void *wxGetClipboardData(wxDataFormat dataFormat, long *len)


@@ -430,9 +435,6 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
                 wxBM->SetWidth(bm.bmWidth);
                 wxBM->SetHeight(bm.bmHeight);
                 wxBM->SetDepth(bm.bmPlanes);
                 wxBM->SetWidth(bm.bmWidth);
                 wxBM->SetHeight(bm.bmHeight);
                 wxBM->SetDepth(bm.bmPlanes);

-#if WXWIN_COMPATIBILITY_2
-                wxBM->SetOk(TRUE);
-#endif // WXWIN_COMPATIBILITY_2

                 retval = wxBM;
                 break;
             }
                 retval = wxBM;
                 break;
             }


@@ -532,8 +534,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 
 wxClipboard::wxClipboard()
 {
 
 wxClipboard::wxClipboard()
 {

-    m_clearOnExit = FALSE;
-    m_isOpened = FALSE;
+    m_clearOnExit = false;
+    m_isOpened = false;

 }
 
 wxClipboard::~wxClipboard()
 }
 
 wxClipboard::~wxClipboard()


@@ -561,25 +563,25 @@ bool wxClipboard::Flush()
     {
         wxLogLastError(wxT("OleFlushClipboard"));
 
     {
         wxLogLastError(wxT("OleFlushClipboard"));
 

-        return FALSE;
+        return false;

     }
     else
     {
     }
     else
     {

-        m_clearOnExit = FALSE;
+        m_clearOnExit = false;

 
 

-        return TRUE;
+        return true;

     }
 #else // !wxUSE_OLE_CLIPBOARD
     }
 #else // !wxUSE_OLE_CLIPBOARD

-    return FALSE;
+    return false;

 #endif // wxUSE_OLE_CLIPBOARD/!wxUSE_OLE_CLIPBOARD
 }
 
 bool wxClipboard::Open()
 {
     // OLE opens clipboard for us
 #endif // wxUSE_OLE_CLIPBOARD/!wxUSE_OLE_CLIPBOARD
 }
 
 bool wxClipboard::Open()
 {
     // OLE opens clipboard for us

-    m_isOpened = TRUE;
+    m_isOpened = true;

 #if wxUSE_OLE_CLIPBOARD
 #if wxUSE_OLE_CLIPBOARD

-    return TRUE;
+    return true;

 #else
     return wxOpenClipboard();
 #endif
 #else
     return wxOpenClipboard();
 #endif


@@ -603,12 +605,12 @@ bool wxClipboard::SetData( wxDataObject *data )
     if ( data )
         return AddData(data);
     else
     if ( data )
         return AddData(data);
     else

-        return TRUE;
+        return true;

 }
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
 }
 
 bool wxClipboard::AddData( wxDataObject *data )
 {

-    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
+    wxCHECK_MSG( data, false, wxT("data is invalid") );

 
 #if wxUSE_OLE_CLIPBOARD
     HRESULT hr = OleSetClipboard(data->GetInterface());
 
 #if wxUSE_OLE_CLIPBOARD
     HRESULT hr = OleSetClipboard(data->GetInterface());


@@ -618,7 +620,7 @@ bool wxClipboard::AddData( wxDataObject *data )
 
         // don't free anything in this case
 
 
         // don't free anything in this case
 

-        return FALSE;
+        return false;

     }
 
     // we have a problem here because we should delete wxDataObject, but we
     }
 
     // we have a problem here because we should delete wxDataObject, but we


@@ -632,11 +634,11 @@ bool wxClipboard::AddData( wxDataObject *data )
     // using OLE clipboard when the app terminates - by default, we call
     // OleSetClipboard(NULL) which won't waste RAM, but the app can call
     // wxClipboard::Flush() to chaneg this
     // using OLE clipboard when the app terminates - by default, we call
     // OleSetClipboard(NULL) which won't waste RAM, but the app can call
     // wxClipboard::Flush() to chaneg this

-    m_clearOnExit = TRUE;
+    m_clearOnExit = true;

 
 

-    return TRUE;
+    return true;

 #elif wxUSE_DATAOBJ
 #elif wxUSE_DATAOBJ

-    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( wxIsClipboardOpened(), false, wxT("clipboard not open") );

 
     wxDataFormat format = data->GetPreferredFormat();
 
 
     wxDataFormat format = data->GetPreferredFormat();
 


@@ -663,8 +665,8 @@ bool wxClipboard::AddData( wxDataObject *data )
         {
 #if 1
             // TODO
         {
 #if 1
             // TODO

-            wxLogError("Not implemented because wxMetafileDataObject does not contain width and height values.");
-            return FALSE;
+            wxLogError(wxT("Not implemented because wxMetafileDataObject does not contain width and height values."));
+            return false;

 #else
             wxMetafileDataObject* metaFileDataObject =
                 (wxMetafileDataObject*) data;
 #else
             wxMetafileDataObject* metaFileDataObject =
                 (wxMetafileDataObject*) data;


@@ -682,24 +684,24 @@ bool wxClipboard::AddData( wxDataObject *data )
 //            return wxSetClipboardData(data);
             // TODO
             wxLogError(wxT("Not implemented."));
 //            return wxSetClipboardData(data);
             // TODO
             wxLogError(wxT("Not implemented."));

-            return FALSE;
+            return false;

         }
     }
 #else // !wxUSE_DATAOBJ
         }
     }
 #else // !wxUSE_DATAOBJ

-    return FALSE;
+    return false;

 #endif // wxUSE_DATAOBJ/!wxUSE_DATAOBJ
 }
 
 void wxClipboard::Close()
 {
 #endif // wxUSE_DATAOBJ/!wxUSE_DATAOBJ
 }
 
 void wxClipboard::Close()
 {

-    m_isOpened = FALSE;
+    m_isOpened = false;

     // OLE closes clipboard for us
 #if !wxUSE_OLE_CLIPBOARD
     wxCloseClipboard();
 #endif
 }
 
     // OLE closes clipboard for us
 #if !wxUSE_OLE_CLIPBOARD
     wxCloseClipboard();
 #endif
 }
 

-bool wxClipboard::IsSupported( wxDataFormat format )
+bool wxClipboard::IsSupported( const wxDataFormat& format )

 {
     return wxIsClipboardFormatAvailable(format);
 }
 {
     return wxIsClipboardFormatAvailable(format);
 }


@@ -713,7 +715,7 @@ bool wxClipboard::GetData( wxDataObject& data )
     {
         wxLogSysError(hr, _("Failed to get data from the clipboard"));
 
     {
         wxLogSysError(hr, _("Failed to get data from the clipboard"));
 

-        return FALSE;
+        return false;

     }
 
     // build the list of supported formats
     }
 
     // build the list of supported formats


@@ -733,9 +735,16 @@ bool wxClipboard::GetData( wxDataObject& data )
 
     data.GetAllFormats(formats, wxDataObject::Set);
 
 
     data.GetAllFormats(formats, wxDataObject::Set);
 

+    // get the data for the given formats
+    FORMATETC formatEtc;
+    CLIPFORMAT cf;
+    bool result = false;
+
+    // enumerate all explicit formats on the clipboard.
+    // note that this does not include implicit / synthetic (automatically
+    // converted) formats.
+#ifdef __WXDEBUG__

     // get the format enumerator
     // get the format enumerator

-    bool result = FALSE;
-    wxArrayInt supportedFormats;

     IEnumFORMATETC *pEnumFormatEtc = NULL;
     hr = pDataObject->EnumFormatEtc(DATADIR_GET, &pEnumFormatEtc);
     if ( FAILED(hr) || !pEnumFormatEtc )
     IEnumFORMATETC *pEnumFormatEtc = NULL;
     hr = pDataObject->EnumFormatEtc(DATADIR_GET, &pEnumFormatEtc);
     if ( FAILED(hr) || !pEnumFormatEtc )


@@ -746,7 +755,6 @@ bool wxClipboard::GetData( wxDataObject& data )
     else
     {
         // ask for the supported formats and see if there are any we support
     else
     {
         // ask for the supported formats and see if there are any we support

-        FORMATETC formatEtc;

         for ( ;; )
         {
             ULONG nCount;
         for ( ;; )
         {
             ULONG nCount;


@@ -759,108 +767,99 @@ bool wxClipboard::GetData( wxDataObject& data )
                 break;
             }
 
                 break;
             }
 

-            CLIPFORMAT cf = formatEtc.cfFormat;
+            cf = formatEtc.cfFormat;

 
 

-#ifdef __WXDEBUG__

             wxLogTrace(wxTRACE_OleCalls,
                        wxT("Object on the clipboard supports format %s."),
                        wxDataObject::GetFormatName(cf));
             wxLogTrace(wxTRACE_OleCalls,
                        wxT("Object on the clipboard supports format %s."),
                        wxDataObject::GetFormatName(cf));

-#endif // Debug
-
-            // is supported?
-            for ( size_t n = 0; n < nFormats; n++ )
-            {
-                if ( formats[n].GetFormatId() == cf )
-                {
-                    if ( supportedFormats.Index(cf) == wxNOT_FOUND )
-                    {
-                        supportedFormats.Add(cf);
-                    }
-                }
-            }

         }
 
         pEnumFormatEtc->Release();
     }
         }
 
         pEnumFormatEtc->Release();
     }

+#endif // Debug

 
 

-    if ( formats != &format )
+    STGMEDIUM medium;
+    // stop at the first valid format found on the clipboard
+    for ( size_t n = 0; !result && (n < nFormats); n++ )

     {
     {

-        delete [] formats;
-    }
-    //else: we didn't allocate any memory
+        // convert to NativeFormat Id
+        cf = formats[n].GetFormatId();

 
 

-    if ( !supportedFormats.IsEmpty() )
-    {
-        FORMATETC formatEtc;
+        // if the format is not available, try the next one
+        // this test includes implicit / sythetic formats
+        if ( !::IsClipboardFormatAvailable(cf) )
+            continue;
+
+        formatEtc.cfFormat = cf;

         formatEtc.ptd      = NULL;
         formatEtc.dwAspect = DVASPECT_CONTENT;
         formatEtc.lindex   = -1;
 
         formatEtc.ptd      = NULL;
         formatEtc.dwAspect = DVASPECT_CONTENT;
         formatEtc.lindex   = -1;
 

-        size_t nSupportedFormats = supportedFormats.GetCount();
-        for ( size_t n = 0; !result && (n < nSupportedFormats); n++ )
+        // use the appropriate tymed
+        switch ( formatEtc.cfFormat )

         {
         {

-            STGMEDIUM medium;
-            formatEtc.cfFormat = supportedFormats[n];
+            case CF_BITMAP:
+                formatEtc.tymed = TYMED_GDI;
+                break;

 
 

-            // use the appropriate tymed
-            switch ( formatEtc.cfFormat )
-            {
-                case CF_BITMAP:
-                    formatEtc.tymed = TYMED_GDI;
-                    break;

 #ifndef __WXWINCE__
 #ifndef __WXWINCE__

-                case CF_METAFILEPICT:
-                    formatEtc.tymed = TYMED_MFPICT;
-                    break;
+            case CF_METAFILEPICT:
+                formatEtc.tymed = TYMED_MFPICT;
+                break;

 
 

-                case CF_ENHMETAFILE:
-                    formatEtc.tymed = TYMED_ENHMF;
-                    break;
+            case CF_ENHMETAFILE:
+                formatEtc.tymed = TYMED_ENHMF;
+                break;

 #endif
 #endif

-                default:
-                    formatEtc.tymed = TYMED_HGLOBAL;
-            }

 
 

-            // try to get data
-            hr = pDataObject->GetData(&formatEtc, &medium);
-            if ( FAILED(hr) )
+            default:
+                formatEtc.tymed = TYMED_HGLOBAL;
+        }
+
+        // try to get data
+        hr = pDataObject->GetData(&formatEtc, &medium);
+        if ( FAILED(hr) )
+        {
+            // try other tymed for GDI objects
+            if ( formatEtc.cfFormat == CF_BITMAP )

             {
             {

-                // try other tymed for GDI objects
-                if ( formatEtc.cfFormat == CF_BITMAP )
-                {
-                    formatEtc.tymed = TYMED_HGLOBAL;
-                    hr = pDataObject->GetData(&formatEtc, &medium);
-                }
+                formatEtc.tymed = TYMED_HGLOBAL;
+                hr = pDataObject->GetData(&formatEtc, &medium);

             }
             }

+        }

 
 

-            if ( SUCCEEDED(hr) )
+        if ( SUCCEEDED(hr) )
+        {
+            // pass the data to the data object
+            hr = data.GetInterface()->SetData(&formatEtc, &medium, true);
+            if ( FAILED(hr) )

             {
             {

-                // pass the data to the data object
-                hr = data.GetInterface()->SetData(&formatEtc, &medium, TRUE);
-                if ( FAILED(hr) )
-                {
-                    wxLogDebug(wxT("Failed to set data in wxIDataObject"));
+                wxLogDebug(wxT("Failed to set data in wxIDataObject"));

 
 

-                    // IDataObject only takes the ownership of data if it
-                    // successfully got it - which is not the case here
-                    ReleaseStgMedium(&medium);
-                }
-                else
-                {
-                    result = TRUE;
-                }
+                // IDataObject only takes the ownership of data if it
+                // successfully got it - which is not the case here
+                ReleaseStgMedium(&medium);
+            }
+            else
+            {
+                result = true;

             }
             }

-            //else: unsupported tymed?

         }
         }

+        //else: unsupported tymed?
+    }
+
+    if ( formats != &format )
+    {
+        delete [] formats;

     }
     }

-    //else: unsupported format
+    //else: we didn't allocate any memory

 
     // clean up and return
     pDataObject->Release();
 
     return result;
 #elif wxUSE_DATAOBJ
 
     // clean up and return
     pDataObject->Release();
 
     return result;
 #elif wxUSE_DATAOBJ

-    wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
+    wxCHECK_MSG( wxIsClipboardOpened(), false, wxT("clipboard not open") );

 
     wxDataFormat format = data.GetPreferredFormat();
     switch ( format )
 
     wxDataFormat format = data.GetPreferredFormat();
     switch ( format )


@@ -871,12 +870,12 @@ bool wxClipboard::GetData( wxDataObject& data )
             wxTextDataObject& textDataObject = (wxTextDataObject &)data;
             char* s = (char*)wxGetClipboardData(format);
             if ( !s )
             wxTextDataObject& textDataObject = (wxTextDataObject &)data;
             char* s = (char*)wxGetClipboardData(format);
             if ( !s )

-                return FALSE;
+                return false;

 
             textDataObject.SetText(wxString::FromAscii(s));
             delete [] s;
 
 
             textDataObject.SetText(wxString::FromAscii(s));
             delete [] s;
 

-            return TRUE;
+            return true;

         }
 
         case wxDF_BITMAP:
         }
 
         case wxDF_BITMAP:


@@ -885,12 +884,12 @@ bool wxClipboard::GetData( wxDataObject& data )
             wxBitmapDataObject& bitmapDataObject = (wxBitmapDataObject &)data;
             wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data.GetPreferredFormat());
             if ( !bitmap )
             wxBitmapDataObject& bitmapDataObject = (wxBitmapDataObject &)data;
             wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data.GetPreferredFormat());
             if ( !bitmap )

-                return FALSE;
+                return false;

 
             bitmapDataObject.SetBitmap(*bitmap);
             delete bitmap;
 
 
             bitmapDataObject.SetBitmap(*bitmap);
             delete bitmap;
 

-            return TRUE;
+            return true;

         }
 #if wxUSE_METAFILE
         case wxDF_METAFILE:
         }
 #if wxUSE_METAFILE
         case wxDF_METAFILE:


@@ -898,19 +897,19 @@ bool wxClipboard::GetData( wxDataObject& data )
             wxMetafileDataObject& metaFileDataObject = (wxMetafileDataObject &)data;
             wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);
             if ( !metaFile )
             wxMetafileDataObject& metaFileDataObject = (wxMetafileDataObject &)data;
             wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);
             if ( !metaFile )

-                return FALSE;
+                return false;

 
             metaFileDataObject.SetMetafile(*metaFile);
             delete metaFile;
 
 
             metaFileDataObject.SetMetafile(*metaFile);
             delete metaFile;
 

-            return TRUE;
+            return true;

         }
 #endif // wxUSE_METAFILE
     }
         }
 #endif // wxUSE_METAFILE
     }

-    return FALSE;
+    return false;

 #else // !wxUSE_DATAOBJ
     wxFAIL_MSG( wxT("no clipboard implementation") );
 #else // !wxUSE_DATAOBJ
     wxFAIL_MSG( wxT("no clipboard implementation") );

-    return FALSE;
+    return false;

 #endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ
 }
 
 #endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ
 }