X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3897b707bd39c491c820849953431e4a5751fced..1832043f93af07af3f4891d9a95c4d4e1f70eec5:/src/msw/clipbrd.cpp?ds=sidebyside diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp index ea427f7e8b..59d6f2fcb0 100644 --- a/src/msw/clipbrd.cpp +++ b/src/msw/clipbrd.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: clipbrd.cpp +// Name: src/msw/clipbrd.cpp // Purpose: Clipboard functionality // Author: Julian Smart // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // =========================================================================== @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "clipbrd.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,12 +24,10 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/setup.h" -#endif - #if wxUSE_CLIPBOARD +#include "wx/clipbrd.h" + #ifndef WX_PRECOMP #include "wx/object.h" #include "wx/event.h" @@ -42,28 +36,32 @@ #include "wx/bitmap.h" #include "wx/utils.h" #include "wx/intl.h" + #include "wx/log.h" #endif #if wxUSE_METAFILE #include "wx/metafile.h" #endif -#include "wx/log.h" -#include "wx/clipbrd.h" #include <string.h> -#include <windows.h> #include "wx/msw/private.h" -#include "wx/msw/dib.h" +#include "wx/msw/ole/oleutils.h" + +#if wxUSE_WXDIB + #include "wx/msw/dib.h" +#endif // wxDataObject is tied to OLE/drag and drop implementation, therefore so are // the functions using wxDataObject in wxClipboard -#define wxUSE_DATAOBJ wxUSE_DRAG_AND_DROP +//#define wxUSE_DATAOBJ wxUSE_DRAG_AND_DROP #if wxUSE_DATAOBJ #include "wx/dataobj.h" +#endif +#if wxUSE_OLE && !defined(__WXWINCE__) // use OLE clipboard #define wxUSE_OLE_CLIPBOARD 1 #else // !wxUSE_DATAOBJ @@ -75,10 +73,6 @@ #include <ole2.h> #endif // wxUSE_OLE_CLIPBOARD -#ifdef __WIN16__ - #define memcpy hmemcpy -#endif - // =========================================================================== // implementation // =========================================================================== @@ -87,11 +81,11 @@ // old-style clipboard functions using Windows API // --------------------------------------------------------------------------- -static bool gs_wxClipboardIsOpen = FALSE; +static bool gs_wxClipboardIsOpen = false; 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 ) @@ -107,24 +101,24 @@ bool wxOpenClipboard() { wxLogDebug(wxT("Can not open clipboard without a main window.")); - return FALSE; + return false; } } 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.")); - return FALSE; + return false; } - return TRUE; + return true; } bool wxEmptyClipboard() @@ -133,10 +127,10 @@ bool wxEmptyClipboard() { wxLogSysError(_("Failed to empty the clipboard.")); - return FALSE; + return false; } - return TRUE; + return true; } bool wxIsClipboardOpened() @@ -146,29 +140,32 @@ bool wxIsClipboardOpened() bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat) { - if ( ::IsClipboardFormatAvailable(dataFormat) ) + wxDataFormat::NativeFormat cf = dataFormat.GetFormatId(); + + if ( ::IsClipboardFormatAvailable(cf) ) { // ok from the first try - return TRUE; + 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; -#if wxUSE_ENH_METAFILE && !defined(__WIN16__) +#if wxUSE_ENH_METAFILE && !defined(__WXWINCE__) case CF_METAFILEPICT: return ::IsClipboardFormatAvailable(CF_ENHMETAFILE) != 0; #endif // wxUSE_ENH_METAFILE default: - return FALSE; + return false; } } + bool wxSetClipboardData(wxDataFormat dataFormat, const void *data, int width, int height) @@ -193,7 +190,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat, SelectObject(hdcSrc, old); DeleteDC(hdcMem); DeleteDC(hdcSrc); - return FALSE; + return false; } HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hBitmap); @@ -213,22 +210,27 @@ bool wxSetClipboardData(wxDataFormat dataFormat, break; } +#if wxUSE_WXDIB case wxDF_DIB: { -#if wxUSE_IMAGE_LOADING_IN_MSW wxBitmap *bitmap = (wxBitmap *)data; - HBITMAP hBitmap = (HBITMAP)bitmap->GetHBITMAP(); - // NULL palette means to use the system one - HANDLE hDIB = wxBitmapToDIB(hBitmap, (HPALETTE)NULL); - handle = SetClipboardData(CF_DIB, hDIB); -#endif // wxUSE_IMAGE_LOADING_IN_MSW + + if ( bitmap && bitmap->Ok() ) + { + wxDIB dib(*bitmap); + if ( dib.IsOk() ) + { + handle = ::SetClipboardData(CF_DIB, dib.Detach()); + } + } break; } +#endif // 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 + // and, anyhow, I'd be highly surprised if it did. So I leave it here // but IMNSHO it is completely broken. -#if wxUSE_METAFILE && !defined(wxMETAFILE_IS_ENH) +#if wxUSE_METAFILE && !defined(wxMETAFILE_IS_ENH) && !defined(__WXWINCE__) case wxDF_METAFILE: { wxMetafile *wxMF = (wxMetafile *)data; @@ -247,7 +249,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat, } #endif // wxUSE_METAFILE -#if wxUSE_ENH_METAFILE && !defined(__WIN16__) +#if wxUSE_ENH_METAFILE && !defined(__WXWINCE__) case wxDF_ENHMETAFILE: { wxEnhMetaFile *emf = (wxEnhMetaFile *)data; @@ -266,7 +268,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat, default: { wxLogError(_("Unsupported clipboard format.")); - return FALSE; + return false; } case wxDF_OEMTEXT: @@ -293,16 +295,90 @@ bool wxSetClipboardData(wxDataFormat dataFormat, handle = SetClipboardData(dataFormat, hGlobalMemory); break; } + // Only tested with Visual C++ 6.0 so far +#if defined(__VISUALC__) + case wxDF_HTML: + { + char* html = (char *)data; + + // Create temporary buffer for HTML header... + char *buf = new char [400 + strlen(html)]; + if(!buf) return false; + + // 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" + "StartHTML:00000000\r\n" + "EndHTML:00000000\r\n" + "StartFragment:00000000\r\n" + "EndFragment:00000000\r\n" + "<html><body>\r\n" + "<!--StartFragment -->\r\n"); + + // Append the HTML... + strcat(buf, html); + strcat(buf, "\r\n"); + // Finish up the HTML format... + strcat(buf, + "<!--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 + // the 0 appended at the end with a '\r'... + char *ptr = strstr(buf, "StartHTML"); + sprintf(ptr+10, "%08u", strstr(buf, "<html>") - buf); + *(ptr+10+8) = '\r'; + + ptr = strstr(buf, "EndHTML"); + sprintf(ptr+8, "%08u", strlen(buf)); + *(ptr+8+8) = '\r'; + + ptr = strstr(buf, "StartFragment"); + sprintf(ptr+14, "%08u", strstr(buf, "<!--StartFrag") - buf); + *(ptr+14+8) = '\r'; + + ptr = strstr(buf, "EndFragment"); + sprintf(ptr+12, "%08u", strstr(buf, "<!--EndFrag") - buf); + *(ptr+12+8) = '\r'; + + // 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); + + // Put your string in the global memory... + ptr = (char *)GlobalLock(hText); + strcpy(ptr, buf); + GlobalUnlock(hText); + + handle = ::SetClipboardData(cfid, hText); + + // Free memory... + GlobalFree(hText); + + // Clean up... + delete [] buf; + break; + } +#endif } if ( handle == 0 ) { wxLogSysError(_("Failed to set clipboard data.")); - return FALSE; + return false; } - return TRUE; + return true; } void *wxGetClipboardData(wxDataFormat dataFormat, long *len) @@ -311,6 +387,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len) switch ( dataFormat ) { +#ifndef __WXWINCE__ case wxDF_BITMAP: { BITMAP bm; @@ -352,23 +429,18 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len) 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; } - +#endif case wxDF_METAFILE: case CF_SYLK: case CF_DIF: case CF_TIFF: case CF_PALETTE: case wxDF_DIB: - { - wxLogError(_("Unsupported clipboard format.")); - return FALSE; - } + wxLogError(_("Unsupported clipboard format.")); + return NULL; case wxDF_OEMTEXT: dataFormat = wxDF_TEXT; @@ -388,11 +460,11 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len) if (!s) break; - LPSTR lpGlobalMemory = (LPSTR)::GlobalLock(hGlobalMemory); + LPSTR lpGlobalMemory = (LPSTR) GlobalLock(hGlobalMemory); memcpy(s, lpGlobalMemory, hsize); - ::GlobalUnlock(hGlobalMemory); + GlobalUnlock(hGlobalMemory); retval = s; break; @@ -412,11 +484,11 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len) if ( !buf ) break; - LPSTR lpGlobalMemory = (LPSTR)::GlobalLock(hGlobalMemory); + LPSTR lpGlobalMemory = (LPSTR) GlobalLock(hGlobalMemory); memcpy(buf, lpGlobalMemory, size); - ::GlobalUnlock(hGlobalMemory); + GlobalUnlock(hGlobalMemory); retval = buf; break; @@ -433,7 +505,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len) wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat) { - return ::EnumClipboardFormats(dataFormat); + return (wxDataFormat::NativeFormat)::EnumClipboardFormats(dataFormat); } int wxRegisterClipboardFormat(wxChar *formatName) @@ -456,52 +528,78 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject) wxClipboard::wxClipboard() { - m_clearOnExit = FALSE; +#if wxUSE_OLE_CLIPBOARD + wxOleInitialize(); +#endif + + m_lastDataObject = NULL; + m_isOpened = false; } wxClipboard::~wxClipboard() { - if ( m_clearOnExit ) + if ( m_lastDataObject ) { Clear(); } + +#if wxUSE_OLE_CLIPBOARD + wxOleUninitialize(); +#endif } void wxClipboard::Clear() { #if wxUSE_OLE_CLIPBOARD - if ( FAILED(OleSetClipboard(NULL)) ) + if (m_lastDataObject) + { + // don't touch data set by other applications + HRESULT hr = OleIsCurrentClipboard(m_lastDataObject); + if (S_OK == hr) + { + hr = OleSetClipboard(NULL); + if ( FAILED(hr) ) { - wxLogLastError(wxT("OleSetClipboard(NULL)")); + wxLogApiError(wxT("OleSetClipboard(NULL)"), hr); } -#endif + } + m_lastDataObject = NULL; + } +#endif // wxUSE_OLE_CLIPBOARD } bool wxClipboard::Flush() { #if wxUSE_OLE_CLIPBOARD - if ( FAILED(OleFlushClipboard()) ) + if (m_lastDataObject) { - wxLogLastError(wxT("OleFlushClipboard")); - - return FALSE; - } - else + // don't touch data set by other applications + HRESULT hr = OleIsCurrentClipboard(m_lastDataObject); + m_lastDataObject = NULL; + if (S_OK == hr) + { + hr = OleFlushClipboard(); + if ( FAILED(hr) ) { - m_clearOnExit = FALSE; + wxLogApiError(wxT("OleFlushClipboard"), hr); - return TRUE; + return false; + } + return true; } + } + return false; #else // !wxUSE_OLE_CLIPBOARD - return FALSE; + return false; #endif // wxUSE_OLE_CLIPBOARD/!wxUSE_OLE_CLIPBOARD } bool wxClipboard::Open() { // OLE opens clipboard for us + m_isOpened = true; #if wxUSE_OLE_CLIPBOARD - return TRUE; + return true; #else return wxOpenClipboard(); #endif @@ -510,7 +608,7 @@ bool wxClipboard::Open() bool wxClipboard::IsOpened() const { #if wxUSE_OLE_CLIPBOARD - return TRUE; + return m_isOpened; #else return wxIsClipboardOpened(); #endif @@ -525,12 +623,12 @@ bool wxClipboard::SetData( wxDataObject *data ) if ( data ) return AddData(data); else - return TRUE; + return true; } 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()); @@ -540,9 +638,15 @@ bool wxClipboard::AddData( wxDataObject *data ) // don't free anything in this case - return FALSE; + return false; } + // we have to call either OleSetClipboard(NULL) or OleFlushClipboard() when + // 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 change this + m_lastDataObject = data->GetInterface(); + // we have a problem here because we should delete wxDataObject, but we // can't do it because IDataObject which we just gave to the clipboard // would try to use it when it will need the data. IDataObject is ref @@ -550,17 +654,11 @@ bool wxClipboard::AddData( wxDataObject *data ) // and tell it to delete wxDataObject when it is deleted itself. data->SetAutoDelete(); - // we have to call either OleSetClipboard(NULL) or OleFlushClipboard() when - // 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; - - return TRUE; + return true; #elif wxUSE_DATAOBJ - wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") ); + wxCHECK_MSG( wxIsClipboardOpened(), false, wxT("clipboard not open") ); - wxDataFormat format = data->GetFormat(); + wxDataFormat format = data->GetPreferredFormat(); switch ( format ) { @@ -577,38 +675,51 @@ 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 case wxDF_METAFILE: { - wxMetafileDataObject* metaFileDataObject = +#if 1 + // TODO + wxLogError(wxT("Not implemented because wxMetafileDataObject does not contain width and height values.")); + return false; +#else + wxMetafileDataObject* metaFileDataObject = (wxMetafileDataObject*) data; wxMetafile metaFile = metaFileDataObject->GetMetafile(); return wxSetClipboardData(wxDF_METAFILE, &metaFile, metaFileDataObject->GetWidth(), metaFileDataObject->GetHeight()); +#endif } #endif // wxUSE_METAFILE default: - return wxSetClipboardData(data); + { +// This didn't compile, of course +// return wxSetClipboardData(data); + // TODO + wxLogError(wxT("Not implemented.")); + return false; + } } #else // !wxUSE_DATAOBJ - return FALSE; + return false; #endif // wxUSE_DATAOBJ/!wxUSE_DATAOBJ } void wxClipboard::Close() { + m_isOpened = false; // 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); } @@ -622,12 +733,13 @@ bool wxClipboard::GetData( wxDataObject& data ) { wxLogSysError(hr, _("Failed to get data from the clipboard")); - return FALSE; + return false; } // build the list of supported formats size_t nFormats = data.GetFormatCount(wxDataObject::Set); - wxDataFormat format, *formats; + wxDataFormat format; + wxDataFormat *formats; if ( nFormats == 1 ) { // the most common case @@ -641,9 +753,16 @@ bool wxClipboard::GetData( wxDataObject& data ) 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 - bool result = FALSE; - wxArrayInt supportedFormats; IEnumFORMATETC *pEnumFormatEtc = NULL; hr = pDataObject->EnumFormatEtc(DATADIR_GET, &pEnumFormatEtc); if ( FAILED(hr) || !pEnumFormatEtc ) @@ -654,7 +773,6 @@ bool wxClipboard::GetData( wxDataObject& data ) else { // ask for the supported formats and see if there are any we support - FORMATETC formatEtc; for ( ;; ) { ULONG nCount; @@ -667,110 +785,101 @@ bool wxClipboard::GetData( wxDataObject& data ) break; } - CLIPFORMAT cf = formatEtc.cfFormat; + cf = formatEtc.cfFormat; -#ifdef __WXDEBUG__ 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(); } +#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; - 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__ + case CF_METAFILEPICT: + formatEtc.tymed = TYMED_MFPICT; + break; - case CF_METAFILEPICT: - formatEtc.tymed = TYMED_MFPICT; - break; + case CF_ENHMETAFILE: + formatEtc.tymed = TYMED_ENHMF; + break; +#endif - case CF_ENHMETAFILE: - formatEtc.tymed = TYMED_ENHMF; - break; + default: + formatEtc.tymed = TYMED_HGLOBAL; + } - 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 ) + { + formatEtc.tymed = TYMED_HGLOBAL; + hr = pDataObject->GetData(&formatEtc, &medium); } + } - // try to get data - hr = pDataObject->GetData(&formatEtc, &medium); + if ( SUCCEEDED(hr) ) + { + // pass the data to the data object + hr = data.GetInterface()->SetData(&formatEtc, &medium, true); if ( FAILED(hr) ) { - // try other tymed for GDI objects - if ( formatEtc.cfFormat == CF_BITMAP ) - { - formatEtc.tymed = TYMED_HGLOBAL; - hr = pDataObject->GetData(&formatEtc, &medium); - } - } + wxLogDebug(wxT("Failed to set data in wxIDataObject")); - if ( SUCCEEDED(hr) ) + // IDataObject only takes the ownership of data if it + // successfully got it - which is not the case here + ReleaseStgMedium(&medium); + } + else { - // 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")); - - // IDataObject only takes the ownership of data if it - // successfully got it - which is not the case here - ReleaseStgMedium(&medium); - } - else - { - result = TRUE; - } + 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(); return result; #elif wxUSE_DATAOBJ - wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") ); + wxCHECK_MSG( wxIsClipboardOpened(), false, wxT("clipboard not open") ); - wxDataFormat format = data.GetFormat(); + wxDataFormat format = data.GetPreferredFormat(); switch ( format ) { case wxDF_TEXT: @@ -779,26 +888,26 @@ bool wxClipboard::GetData( wxDataObject& data ) wxTextDataObject& textDataObject = (wxTextDataObject &)data; char* s = (char*)wxGetClipboardData(format); if ( !s ) - return FALSE; + return false; - textDataObject.SetText(s); + textDataObject.SetText(wxString::FromAscii(s)); delete [] s; - return TRUE; + return true; } case wxDF_BITMAP: case wxDF_DIB: { wxBitmapDataObject& bitmapDataObject = (wxBitmapDataObject &)data; - wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data->GetFormat()); + wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data.GetPreferredFormat()); if ( !bitmap ) - return FALSE; + return false; bitmapDataObject.SetBitmap(*bitmap); delete bitmap; - return TRUE; + return true; } #if wxUSE_METAFILE case wxDF_METAFILE: @@ -806,23 +915,20 @@ bool wxClipboard::GetData( wxDataObject& data ) wxMetafileDataObject& metaFileDataObject = (wxMetafileDataObject &)data; wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE); if ( !metaFile ) - return FALSE; + return false; metaFileDataObject.SetMetafile(*metaFile); delete metaFile; - return TRUE; + return true; } #endif // wxUSE_METAFILE } - return FALSE; + return false; #else // !wxUSE_DATAOBJ wxFAIL_MSG( wxT("no clipboard implementation") ); - return FALSE; + return false; #endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ } -#else -// #error "Please turn wxUSE_CLIPBOARD on to compile this file." #endif // wxUSE_CLIPBOARD -