X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b4f47a319cfaa434e00025aa779e407fbacee23..ad653fa23069c5d9378247084f03c9a718c3ad62:/src/msw/clipbrd.cpp diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp index c3ed1b194b..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: @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #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,31 +36,28 @@ #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 #include "wx/msw/private.h" +#include "wx/msw/ole/oleutils.h" #if wxUSE_WXDIB -#include "wx/msw/dib.h" + #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 -#if wxUSE_DATAOBJ - #include "wx/dataobj.h" -#endif - #if wxUSE_OLE && !defined(__WXWINCE__) // use OLE clipboard #define wxUSE_OLE_CLIPBOARD 1 @@ -87,11 +78,12 @@ // old-style clipboard functions using Windows API // --------------------------------------------------------------------------- -static bool gs_wxClipboardIsOpen = FALSE; +static bool gs_wxClipboardIsOpen = false; +static int gs_htmlcfid = 0; 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 ) @@ -99,32 +91,34 @@ 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; + 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,12 +140,14 @@ 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) ) { // ok from the first try - return TRUE; + return true; } // for several standard formats, we can convert from some other ones too @@ -167,7 +163,7 @@ bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat) #endif // wxUSE_ENH_METAFILE default: - return FALSE; + return false; } } @@ -196,7 +192,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat, SelectObject(hdcSrc, old); DeleteDC(hdcMem); DeleteDC(hdcSrc); - return FALSE; + return false; } HBITMAP old1 = (HBITMAP) SelectObject(hdcMem, hBitmap); @@ -221,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() ) @@ -274,7 +270,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat, default: { wxLogError(_("Unsupported clipboard format.")); - return FALSE; + return false; } case wxDF_OEMTEXT: @@ -301,20 +297,16 @@ bool wxSetClipboardData(wxDataFormat dataFormat, handle = SetClipboardData(dataFormat, hGlobalMemory); break; } - // Only tested with non-Unicode, Visual C++ 6.0 so far -#if defined(__VISUALC__) && !defined(UNICODE) + // 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")); - + if(!buf) return false; + // Create a template string for the HTML header... strcpy(buf, "Version:0.9\r\n" @@ -324,7 +316,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat, "EndFragment:00000000\r\n" "\r\n" "\r\n"); - + // Append the HTML... strcat(buf, html); strcat(buf, "\r\n"); @@ -333,43 +325,43 @@ bool wxSetClipboardData(wxDataFormat dataFormat, "\r\n" "\r\n" ""); - + // 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"); - wsprintf(ptr+10, "%08u", strstr(buf, "") - buf); + sprintf(ptr+10, "%08u", (unsigned)(strstr(buf, "") - buf)); *(ptr+10+8) = '\r'; - + ptr = strstr(buf, "EndHTML"); - wsprintf(ptr+8, "%08u", strlen(buf)); + sprintf(ptr+8, "%08u", (unsigned)strlen(buf)); *(ptr+8+8) = '\r'; - + ptr = strstr(buf, "StartFragment"); - wsprintf(ptr+14, "%08u", strstr(buf, "