Get rid of the CVS merge characters that have worked their way into this causing...

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

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index d9ca91ec449636965bfca7a19cab8c4cb072fe3e..baf1e064b22cd01de070a410e9192c3d2a2cf739 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -146,10 +146,27 @@ bool wxIsClipboardOpened()
 
 bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
 {
 
 bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
 {

-    // for bitmaps, DIBs will also do
-    return (::IsClipboardFormatAvailable(dataFormat) != 0) ||
-           (dataFormat.GetFormatId() == CF_BITMAP &&
-            ::IsClipboardFormatAvailable(CF_DIB));
+    if ( ::IsClipboardFormatAvailable(dataFormat) )
+    {
+        // ok from the first try
+        return TRUE;
+    }
+
+    // for several standard formats, we can convert from some other ones too
+    switch ( dataFormat.GetFormatId() )
+    {
+        // for bitmaps, DIBs will also do
+        case CF_BITMAP:
+            return ::IsClipboardFormatAvailable(CF_DIB) != 0;
+
+#if wxUSE_ENH_METAFILE && !defined(__WIN16__)
+        case CF_METAFILEPICT:
+            return ::IsClipboardFormatAvailable(CF_ENHMETAFILE) != 0;
+#endif // wxUSE_ENH_METAFILE
+
+        default:
+            return FALSE;
+    }

 }
 
 bool wxSetClipboardData(wxDataFormat dataFormat,
 }
 
 bool wxSetClipboardData(wxDataFormat dataFormat,


@@ -202,13 +219,16 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                 wxBitmap *bitmap = (wxBitmap *)data;
                 HBITMAP hBitmap = (HBITMAP)bitmap->GetHBITMAP();
                 // NULL palette means to use the system one
                 wxBitmap *bitmap = (wxBitmap *)data;
                 HBITMAP hBitmap = (HBITMAP)bitmap->GetHBITMAP();
                 // NULL palette means to use the system one

-                HANDLE hDIB = wxBitmapToDIB(hBitmap, (HPALETTE)NULL); 
+                HANDLE hDIB = wxBitmapToDIB(hBitmap, (HPALETTE)NULL);

                 handle = SetClipboardData(CF_DIB, hDIB);
 #endif // wxUSE_IMAGE_LOADING_IN_MSW
                 break;
             }
 
                 handle = SetClipboardData(CF_DIB, hDIB);
 #endif // wxUSE_IMAGE_LOADING_IN_MSW
                 break;
             }
 

-#if wxUSE_METAFILE
+    // VZ: I'm told that this code works, but it doesn't seem to work for me
+    //     and, anyhow, I'd be highly surprized if it did. So I leave it here
+    //     but IMNSHO it is completely broken.
+#if wxUSE_METAFILE && !defined(wxMETAFILE_IS_ENH)

         case wxDF_METAFILE:
             {
                 wxMetafile *wxMF = (wxMetafile *)data;
         case wxDF_METAFILE:
             {
                 wxMetafile *wxMF = (wxMetafile *)data;


@@ -225,7 +245,20 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                 handle = SetClipboardData(CF_METAFILEPICT, data);
                 break;
             }
                 handle = SetClipboardData(CF_METAFILEPICT, data);
                 break;
             }

-#endif
+#endif // wxUSE_METAFILE
+
+#if wxUSE_ENH_METAFILE && !defined(__WIN16__)
+        case wxDF_ENHMETAFILE:
+            {
+                wxEnhMetaFile *emf = (wxEnhMetaFile *)data;
+                wxEnhMetaFile emfCopy = *emf;
+
+                handle = SetClipboardData(CF_ENHMETAFILE,
+                                          (void *)emfCopy.GetHENHMETAFILE());
+            }
+            break;
+#endif // wxUSE_ENH_METAFILE
+

         case CF_SYLK:
         case CF_DIF:
         case CF_TIFF:
         case CF_SYLK:
         case CF_DIF:
         case CF_TIFF:


@@ -319,7 +352,9 @@ 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);
                 wxBM->SetOk(TRUE);

+#endif // WXWIN_COMPATIBILITY_2

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


@@ -398,7 +433,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 
 wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat)
 {
 
 wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat)
 {

-  return ::EnumClipboardFormats(dataFormat);
+  return (wxDataFormat::NativeFormat)::EnumClipboardFormats(dataFormat);

 }
 
 int wxRegisterClipboardFormat(wxChar *formatName)
 }
 
 int wxRegisterClipboardFormat(wxChar *formatName)


@@ -419,8 +454,6 @@ bool wxGetClipboardFormatName(wxDataFormat dataFormat,
 
 IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 

-wxClipboard* wxTheClipboard = (wxClipboard *)NULL;
-

 wxClipboard::wxClipboard()
 {
     m_clearOnExit = FALSE;
 wxClipboard::wxClipboard()
 {
     m_clearOnExit = FALSE;


@@ -439,7 +472,7 @@ void wxClipboard::Clear()
 #if wxUSE_OLE_CLIPBOARD
     if ( FAILED(OleSetClipboard(NULL)) )
     {
 #if wxUSE_OLE_CLIPBOARD
     if ( FAILED(OleSetClipboard(NULL)) )
     {

-        wxLogLastError("OleSetClipboard(NULL)");
+        wxLogLastError(wxT("OleSetClipboard(NULL)"));

     }
 #endif
 }
     }
 #endif
 }


@@ -449,7 +482,7 @@ bool wxClipboard::Flush()
 #if wxUSE_OLE_CLIPBOARD
     if ( FAILED(OleFlushClipboard()) )
     {
 #if wxUSE_OLE_CLIPBOARD
     if ( FAILED(OleFlushClipboard()) )
     {

-        wxLogLastError("OleFlushClipboard");
+        wxLogLastError(wxT("OleFlushClipboard"));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -485,7 +518,9 @@ bool wxClipboard::IsOpened() const
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
 
 bool wxClipboard::SetData( wxDataObject *data )
 {

+#if !wxUSE_OLE_CLIPBOARD

     (void)wxEmptyClipboard();
     (void)wxEmptyClipboard();

+#endif // wxUSE_OLE_CLIPBOARD

 
     if ( data )
         return AddData(data);
 
     if ( data )
         return AddData(data);


@@ -548,7 +583,7 @@ bool wxClipboard::AddData( wxDataObject *data )
 #if wxUSE_METAFILE
         case wxDF_METAFILE:
         {
 #if wxUSE_METAFILE
         case wxDF_METAFILE:
         {

-            wxMetafileDataObject* metaFileDataObject = 
+            wxMetafileDataObject* metaFileDataObject =

                 (wxMetafileDataObject*) data;
             wxMetafile metaFile = metaFileDataObject->GetMetafile();
             return wxSetClipboardData(wxDF_METAFILE, &metaFile,
                 (wxMetafileDataObject*) data;
             wxMetafile metaFile = metaFileDataObject->GetMetafile();
             return wxSetClipboardData(wxDF_METAFILE, &metaFile,


@@ -578,10 +613,8 @@ bool wxClipboard::IsSupported( wxDataFormat format )
     return wxIsClipboardFormatAvailable(format);
 }
 
     return wxIsClipboardFormatAvailable(format);
 }
 

-bool wxClipboard::GetData( wxDataObject *data )
+bool wxClipboard::GetData( wxDataObject& data )

 {
 {

-    wxCHECK_MSG( data, FALSE, wxT("invalid data object") );
-

 #if wxUSE_OLE_CLIPBOARD
     IDataObject *pDataObject = NULL;
     HRESULT hr = OleGetClipboard(&pDataObject);
 #if wxUSE_OLE_CLIPBOARD
     IDataObject *pDataObject = NULL;
     HRESULT hr = OleGetClipboard(&pDataObject);


@@ -593,8 +626,9 @@ bool wxClipboard::GetData( wxDataObject *data )
     }
 
     // build the list of supported formats
     }
 
     // build the list of supported formats

-    size_t nFormats = data->GetFormatCount(wxDataObject::Set);
-    wxDataFormat format, *formats;
+    size_t nFormats = data.GetFormatCount(wxDataObject::Set);
+    wxDataFormat format;
+       wxDataFormat *formats;

     if ( nFormats == 1 )
     {
         // the most common case
     if ( nFormats == 1 )
     {
         // the most common case


@@ -606,7 +640,7 @@ bool wxClipboard::GetData( wxDataObject *data )
         formats = new wxDataFormat[nFormats];
     }
 
         formats = new wxDataFormat[nFormats];
     }
 

-    data->GetAllFormats(formats, wxDataObject::Set);
+    data.GetAllFormats(formats, wxDataObject::Set);

 
     // get the format enumerator
     bool result = FALSE;
 
     // get the format enumerator
     bool result = FALSE;


@@ -670,7 +704,6 @@ bool wxClipboard::GetData( wxDataObject *data )
         formatEtc.ptd      = NULL;
         formatEtc.dwAspect = DVASPECT_CONTENT;
         formatEtc.lindex   = -1;
         formatEtc.ptd      = NULL;
         formatEtc.dwAspect = DVASPECT_CONTENT;
         formatEtc.lindex   = -1;

-        formatEtc.tymed    = TYMED_HGLOBAL;

 
         size_t nSupportedFormats = supportedFormats.GetCount();
         for ( size_t n = 0; !result && (n < nSupportedFormats); n++ )
 
         size_t nSupportedFormats = supportedFormats.GetCount();
         for ( size_t n = 0; !result && (n < nSupportedFormats); n++ )


@@ -678,6 +711,25 @@ bool wxClipboard::GetData( wxDataObject *data )
             STGMEDIUM medium;
             formatEtc.cfFormat = supportedFormats[n];
 
             STGMEDIUM medium;
             formatEtc.cfFormat = supportedFormats[n];
 

+            // use the appropriate tymed
+            switch ( formatEtc.cfFormat )
+            {
+                case CF_BITMAP:
+                    formatEtc.tymed = TYMED_GDI;
+                    break;
+
+                case CF_METAFILEPICT:
+                    formatEtc.tymed = TYMED_MFPICT;
+                    break;
+
+                case CF_ENHMETAFILE:
+                    formatEtc.tymed = TYMED_ENHMF;
+                    break;
+
+                default:
+                    formatEtc.tymed = TYMED_HGLOBAL;
+            }
+

             // try to get data
             hr = pDataObject->GetData(&formatEtc, &medium);
             if ( FAILED(hr) )
             // try to get data
             hr = pDataObject->GetData(&formatEtc, &medium);
             if ( FAILED(hr) )


@@ -693,7 +745,7 @@ bool wxClipboard::GetData( wxDataObject *data )
             if ( SUCCEEDED(hr) )
             {
                 // pass the data to the data object
             if ( SUCCEEDED(hr) )
             {
                 // pass the data to the data object

-                hr = data->GetInterface()->SetData(&formatEtc, &medium, TRUE);
+                hr = data.GetInterface()->SetData(&formatEtc, &medium, TRUE);

                 if ( FAILED(hr) )
                 {
                     wxLogDebug(wxT("Failed to set data in wxIDataObject"));
                 if ( FAILED(hr) )
                 {
                     wxLogDebug(wxT("Failed to set data in wxIDataObject"));


@@ -719,75 +771,59 @@ bool wxClipboard::GetData( wxDataObject *data )
 #elif wxUSE_DATAOBJ
     wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
 
 #elif wxUSE_DATAOBJ
     wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
 

-    wxDataFormat format = data->GetFormat();
+    wxDataFormat format = data.GetFormat();

     switch ( format )
     {
         case wxDF_TEXT:
         case wxDF_OEMTEXT:
         {
     switch ( format )
     {
         case wxDF_TEXT:
         case wxDF_OEMTEXT:
         {

-            wxTextDataObject* textDataObject = (wxTextDataObject*) data;
-            char* s = (char*) wxGetClipboardData(format);
-            if ( s )
-            {
-                textDataObject->SetText(s);
-                delete[] s;
-                return TRUE;
-            }
-            else
+            wxTextDataObject& textDataObject = (wxTextDataObject &)data;
+            char* s = (char*)wxGetClipboardData(format);
+            if ( !s )

                 return FALSE;
                 return FALSE;

+
+            textDataObject.SetText(s);
+            delete [] s;
+
+            return TRUE;

         }
 
         case wxDF_BITMAP:
         case wxDF_DIB:
         {
         }
 
         case wxDF_BITMAP:
         case wxDF_DIB:
         {

-            wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject *)data;
+            wxBitmapDataObject& bitmapDataObject = (wxBitmapDataObject &)data;

             wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data->GetFormat());
             wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data->GetFormat());

-            if (bitmap)
-            {
-                bitmapDataObject->SetBitmap(* bitmap);
-                delete bitmap;
-                return TRUE;
-            }
-            else
+            if ( !bitmap )

                 return FALSE;
                 return FALSE;

+
+            bitmapDataObject.SetBitmap(*bitmap);
+            delete bitmap;
+
+            return TRUE;

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

-            wxMetafileDataObject* metaFileDataObject = (wxMetafileDataObject *)data;
+            wxMetafileDataObject& metaFileDataObject = (wxMetafileDataObject &)data;

             wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);
             wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);

-            if (metaFile)
-            {
-                metaFileDataObject->SetMetafile(*metaFile);
-                delete metaFile;
-                return TRUE;
-            }
-            else
+            if ( !metaFile )

                 return FALSE;
                 return FALSE;

-        }
-#endif
-        default:
-            {
-                long len;
-                void *buf = wxGetClipboardData(format, &len);
-                if ( buf )
-                {
-                    // FIXME this is for testing only!!
-                    ((wxPrivateDataObject *)data)->SetData(buf, len);
-                    free(buf);

 
 

-                    return TRUE;
-                }
-            }
+            metaFileDataObject.SetMetafile(*metaFile);
+            delete metaFile;

 
 

-            return FALSE;
+            return TRUE;
+        }
+#endif // wxUSE_METAFILE

     }
     }

+    return FALSE;

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

+    wxFAIL_MSG( wxT("no clipboard implementation") );

     return FALSE;
     return FALSE;

-#endif // wxUSE_DATAOBJ/!wxUSE_DATAOBJ
+#endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ

 }
 
 #else
 }
 
 #else

-    #error "Please turn wxUSE_CLIPBOARD on to compile this file."
+//    #error "Please turn wxUSE_CLIPBOARD on to compile this file."

 #endif // wxUSE_CLIPBOARD
 
 #endif // wxUSE_CLIPBOARD