merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions

View File

@@ -472,7 +472,7 @@ void wxClipboard::Clear()
#if wxUSE_OLE_CLIPBOARD
if ( FAILED(OleSetClipboard(NULL)) )
{
wxLogLastError("OleSetClipboard(NULL)");
wxLogLastError(wxT("OleSetClipboard(NULL)"));
}
#endif
}
@@ -482,7 +482,7 @@ bool wxClipboard::Flush()
#if wxUSE_OLE_CLIPBOARD
if ( FAILED(OleFlushClipboard()) )
{
wxLogLastError("OleFlushClipboard");
wxLogLastError(wxT("OleFlushClipboard"));
return FALSE;
}
@@ -823,6 +823,6 @@ bool wxClipboard::GetData( wxDataObject& data )
}
#else
#error "Please turn wxUSE_CLIPBOARD on to compile this file."
// #error "Please turn wxUSE_CLIPBOARD on to compile this file."
#endif // wxUSE_CLIPBOARD