Avoid an assert in wxFrame::SetTitle

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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index fd07c1ffa63e6b36abc2791c2844e0b1a98f7c81..9d351247651e1670efba85920b0a4d784b455383 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "clipbrd.h"
 #endif
 
     #pragma implementation "clipbrd.h"
 #endif
 


@@ -52,7 +52,6 @@
 #include "wx/clipbrd.h"
 
 #include <string.h>
 #include "wx/clipbrd.h"
 
 #include <string.h>

-#include <windows.h>

 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 


@@ -147,20 +146,22 @@ 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
         return TRUE;
     }
 
     // for several standard formats, we can convert from some other ones too
     {
         // ok from the first try
         return TRUE;
     }
 
     // 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
         case CF_METAFILEPICT:
             return ::IsClipboardFormatAvailable(CF_ENHMETAFILE) != 0;
 #endif // wxUSE_ENH_METAFILE


@@ -220,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;
             }


@@ -251,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;


@@ -431,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;
             }


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

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

             return FALSE;
 #else
             wxMetafileDataObject* metaFileDataObject =
             return FALSE;
 #else
             wxMetafileDataObject* metaFileDataObject =


@@ -700,7 +701,7 @@ void wxClipboard::Close()
 #endif
 }
 
 #endif
 }
 

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

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


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

-    // get the format enumerator
+    // get the data for the given formats
+    FORMATETC formatEtc;
+    CLIPFORMAT cf;

     bool result = FALSE;
     bool result = FALSE;

-    wxArrayInt supportedFormats;
+
+    // enumerate all explicit formats on the clipboard.
+    // note that this does not include implicit / synthetic (automatically
+    // converted) formats.
+#ifdef __WXDEBUG__
+    // get the format enumerator

     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 )


@@ -747,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;


@@ -760,101 +767,92 @@ 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 )
-    {
-        delete [] formats;
-    }
-    //else: we didn't allocate any memory
-
-    if ( !supportedFormats.IsEmpty() )
+    STGMEDIUM medium;
+    // stop at the first valid format found on the clipboard
+    for ( size_t n = 0; !result && (n < nFormats); n++ )

     {
     {

-        FORMATETC formatEtc;
+        // convert to NativeFormat Id
+        cf = formats[n].GetFormatId();
+        
+        // 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?

     }
     }

-    //else: unsupported format
+
+    if ( formats != &format )
+    {
+        delete [] formats;
+    }
+    //else: we didn't allocate any memory

 
     // clean up and return
     pDataObject->Release();
 
     // clean up and return
     pDataObject->Release();