X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c039fef565e7ca9a76ccbfdb91c5f6b1eec1ac55..baf60823a6596cc0ad8cc85bd8f076bd1d1c6c99:/src/msw/clipbrd.cpp diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp index 23cd2cce07..bd929dcac3 100644 --- a/src/msw/clipbrd.cpp +++ b/src/msw/clipbrd.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: clipbrd.cpp +// Name: src/msw/clipbrd.cpp // Purpose: Clipboard functionality // Author: Julian Smart // Modified by: @@ -26,6 +26,8 @@ #if wxUSE_CLIPBOARD +#include "wx/clipbrd.h" + #ifndef WX_PRECOMP #include "wx/object.h" #include "wx/event.h" @@ -34,14 +36,14 @@ #include "wx/bitmap.h" #include "wx/utils.h" #include "wx/intl.h" + #include "wx/log.h" + #include "wx/dataobj.h" #endif #if wxUSE_METAFILE #include "wx/metafile.h" #endif -#include "wx/log.h" -#include "wx/clipbrd.h" #include <string.h> @@ -56,10 +58,6 @@ // the functions using wxDataObject in wxClipboard //#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 @@ -81,6 +79,7 @@ // --------------------------------------------------------------------------- static bool gs_wxClipboardIsOpen = false; +static int gs_htmlcfid = 0; bool wxOpenClipboard() { @@ -92,13 +91,15 @@ bool wxOpenClipboard() gs_wxClipboardIsOpen = ::OpenClipboard((HWND)win->GetHWND()) != 0; if ( !gs_wxClipboardIsOpen ) + { wxLogSysError(_("Failed to open the clipboard.")); + } return gs_wxClipboardIsOpen; } else { - wxLogDebug(wxT("Can not open clipboard without a main window.")); + wxLogDebug(wxT("Cannot open clipboard without a main window.")); return false; } @@ -139,7 +140,9 @@ bool wxIsClipboardOpened() bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat) { - wxDataFormat::NativeFormat cf = dataFormat.GetFormatId(); + wxDataFormat::NativeFormat cf = dataFormat.GetFormatId(); + if (cf == wxDF_HTML) + cf = gs_htmlcfid; if ( ::IsClipboardFormatAvailable(cf) ) { @@ -214,7 +217,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat, { wxBitmap *bitmap = (wxBitmap *)data; - if ( bitmap && bitmap->Ok() ) + if ( bitmap && bitmap->IsOk() ) { wxDIB dib(*bitmap); if ( dib.IsOk() ) @@ -304,10 +307,6 @@ bool wxSetClipboardData(wxDataFormat dataFormat, 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" @@ -332,19 +331,19 @@ bool wxSetClipboardData(wxDataFormat dataFormat, // 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); + sprintf(ptr+10, "%08u", (unsigned)(strstr(buf, "<html>") - buf)); *(ptr+10+8) = '\r'; ptr = strstr(buf, "EndHTML"); - sprintf(ptr+8, "%08u", strlen(buf)); + sprintf(ptr+8, "%08u", (unsigned)strlen(buf)); *(ptr+8+8) = '\r'; ptr = strstr(buf, "StartFragment"); - sprintf(ptr+14, "%08u", strstr(buf, "<!--StartFrag") - buf); + sprintf(ptr+14, "%08u", (unsigned)(strstr(buf, "<!--StartFrag") - buf)); *(ptr+14+8) = '\r'; ptr = strstr(buf, "EndFragment"); - sprintf(ptr+12, "%08u", strstr(buf, "<!--EndFrag") - buf); + sprintf(ptr+12, "%08u", (unsigned)(strstr(buf, "<!--EndFrag") - buf)); *(ptr+12+8) = '\r'; // Now you have everything in place ready to put on the @@ -358,7 +357,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat, strcpy(ptr, buf); GlobalUnlock(hText); - handle = ::SetClipboardData(cfid, hText); + handle = ::SetClipboardData(gs_htmlcfid, hText); // Free memory... GlobalFree(hText); @@ -549,6 +548,9 @@ wxClipboard::~wxClipboard() void wxClipboard::Clear() { + if ( IsUsingPrimarySelection() ) + return; + #if wxUSE_OLE_CLIPBOARD if (m_lastDataObject) { @@ -557,10 +559,10 @@ void wxClipboard::Clear() if (S_OK == hr) { hr = OleSetClipboard(NULL); - if ( FAILED(hr) ) - { - wxLogApiError(wxT("OleSetClipboard(NULL)"), hr); - } + if ( FAILED(hr) ) + { + wxLogApiError(wxT("OleSetClipboard(NULL)"), hr); + } } m_lastDataObject = NULL; } @@ -578,14 +580,14 @@ bool wxClipboard::Flush() if (S_OK == hr) { hr = OleFlushClipboard(); - if ( FAILED(hr) ) - { - wxLogApiError(wxT("OleFlushClipboard"), hr); + if ( FAILED(hr) ) + { + wxLogApiError(wxT("OleFlushClipboard"), hr); - return false; - } - return true; - } + return false; + } + return true; + } } return false; #else // !wxUSE_OLE_CLIPBOARD @@ -595,6 +597,10 @@ bool wxClipboard::Flush() bool wxClipboard::Open() { + // Get clipboard id for HTML format... + if(!gs_htmlcfid) + gs_htmlcfid = RegisterClipboardFormat(wxT("HTML Format")); + // OLE opens clipboard for us m_isOpened = true; #if wxUSE_OLE_CLIPBOARD @@ -615,6 +621,9 @@ bool wxClipboard::IsOpened() const bool wxClipboard::SetData( wxDataObject *data ) { + if ( IsUsingPrimarySelection() ) + return false; + #if !wxUSE_OLE_CLIPBOARD (void)wxEmptyClipboard(); #endif // wxUSE_OLE_CLIPBOARD @@ -627,6 +636,9 @@ bool wxClipboard::SetData( wxDataObject *data ) bool wxClipboard::AddData( wxDataObject *data ) { + if ( IsUsingPrimarySelection() ) + return false; + wxCHECK_MSG( data, false, wxT("data is invalid") ); #if wxUSE_OLE_CLIPBOARD @@ -720,11 +732,14 @@ void wxClipboard::Close() bool wxClipboard::IsSupported( const wxDataFormat& format ) { - return wxIsClipboardFormatAvailable(format); + return !IsUsingPrimarySelection() && wxIsClipboardFormatAvailable(format); } bool wxClipboard::GetData( wxDataObject& data ) { + if ( IsUsingPrimarySelection() ) + return false; + #if wxUSE_OLE_CLIPBOARD IDataObject *pDataObject = NULL; HRESULT hr = OleGetClipboard(&pDataObject); @@ -760,7 +775,7 @@ bool wxClipboard::GetData( wxDataObject& data ) // enumerate all explicit formats on the clipboard. // note that this does not include implicit / synthetic (automatically // converted) formats. -#ifdef __WXDEBUG__ +#if wxDEBUG_LEVEL >= 2 // get the format enumerator IEnumFORMATETC *pEnumFormatEtc = NULL; hr = pDataObject->EnumFormatEtc(DATADIR_GET, &pEnumFormatEtc); @@ -793,7 +808,7 @@ bool wxClipboard::GetData( wxDataObject& data ) pEnumFormatEtc->Release(); } -#endif // Debug +#endif // wxDEBUG_LEVEL >= 2 STGMEDIUM medium; // stop at the first valid format found on the clipboard @@ -802,6 +817,8 @@ bool wxClipboard::GetData( wxDataObject& data ) // convert to NativeFormat Id cf = formats[n].GetFormatId(); + if (cf == wxDF_HTML) + cf = gs_htmlcfid; // if the format is not available, try the next one // this test includes implicit / sythetic formats if ( !::IsClipboardFormatAvailable(cf) ) @@ -931,4 +948,3 @@ bool wxClipboard::GetData( wxDataObject& data ) } #endif // wxUSE_CLIPBOARD -